make/autoconf/flags-cflags.m4
changeset 59281 eef0bf57357c
parent 58909 66f7d2494d4e
child 59287 c04fa10636fd
equal deleted inserted replaced
59280:dff8053bdb74 59281:eef0bf57357c
   188       WARNINGS_ENABLE_ADDITIONAL_CXX="-Woverloaded-virtual -Wreorder"
   188       WARNINGS_ENABLE_ADDITIONAL_CXX="-Woverloaded-virtual -Wreorder"
   189       WARNINGS_ENABLE_ALL_CFLAGS="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
   189       WARNINGS_ENABLE_ALL_CFLAGS="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
   190       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
   190       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
   191 
   191 
   192       DISABLED_WARNINGS="unused-parameter unused"
   192       DISABLED_WARNINGS="unused-parameter unused"
   193 
       
   194       # Repeate the check for the BUILD_CC and BUILD_CXX. Need to also reset
       
   195       # CFLAGS since any target specific flags will likely not work with the
       
   196       # build compiler
       
   197       CC_OLD="$CC"
       
   198       CXX_OLD="$CXX"
       
   199       CC="$BUILD_CC"
       
   200       CXX="$BUILD_CXX"
       
   201       CFLAGS_OLD="$CFLAGS"
       
   202       CFLAGS=""
       
   203       BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
   193       BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
   204       CC="$CC_OLD"
       
   205       CXX="$CXX_OLD"
       
   206       CFLAGS="$CFLAGS_OLD"
       
   207       ;;
   194       ;;
   208 
   195 
   209     clang)
   196     clang)
   210       DISABLE_WARNING_PREFIX="-Wno-"
   197       DISABLE_WARNING_PREFIX="-Wno-"
   211       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
   198       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
   418   FLAGS_CPU_LEGACY=$OPENJDK_TARGET_CPU_LEGACY
   405   FLAGS_CPU_LEGACY=$OPENJDK_TARGET_CPU_LEGACY
   419   FLAGS_CPU_LEGACY_LIB=$OPENJDK_TARGET_CPU_LEGACY_LIB
   406   FLAGS_CPU_LEGACY_LIB=$OPENJDK_TARGET_CPU_LEGACY_LIB
   420 
   407 
   421   FLAGS_SETUP_CFLAGS_CPU_DEP([TARGET])
   408   FLAGS_SETUP_CFLAGS_CPU_DEP([TARGET])
   422 
   409 
       
   410   # Repeat the check for the BUILD_CC and BUILD_CXX. Need to also reset CFLAGS
       
   411   # since any target specific flags will likely not work with the build compiler.
       
   412   CC_OLD="$CC"
       
   413   CXX_OLD="$CXX"
       
   414   CFLAGS_OLD="$CFLAGS"
       
   415   CXXFLAGS_OLD="$CXXFLAGS"
       
   416   CC="$BUILD_CC"
       
   417   CXX="$BUILD_CXX"
       
   418   CFLAGS=""
       
   419   CXXFLAGS=""
       
   420 
   423   FLAGS_OS=$OPENJDK_BUILD_OS
   421   FLAGS_OS=$OPENJDK_BUILD_OS
   424   FLAGS_OS_TYPE=$OPENJDK_BUILD_OS_TYPE
   422   FLAGS_OS_TYPE=$OPENJDK_BUILD_OS_TYPE
   425   FLAGS_CPU=$OPENJDK_BUILD_CPU
   423   FLAGS_CPU=$OPENJDK_BUILD_CPU
   426   FLAGS_CPU_ARCH=$OPENJDK_BUILD_CPU_ARCH
   424   FLAGS_CPU_ARCH=$OPENJDK_BUILD_CPU_ARCH
   427   FLAGS_CPU_BITS=$OPENJDK_BUILD_CPU_BITS
   425   FLAGS_CPU_BITS=$OPENJDK_BUILD_CPU_BITS
   428   FLAGS_CPU_ENDIAN=$OPENJDK_BUILD_CPU_ENDIAN
   426   FLAGS_CPU_ENDIAN=$OPENJDK_BUILD_CPU_ENDIAN
   429   FLAGS_CPU_LEGACY=$OPENJDK_BUILD_CPU_LEGACY
   427   FLAGS_CPU_LEGACY=$OPENJDK_BUILD_CPU_LEGACY
   430   FLAGS_CPU_LEGACY_LIB=$OPENJDK_BUILD_CPU_LEGACY_LIB
   428   FLAGS_CPU_LEGACY_LIB=$OPENJDK_BUILD_CPU_LEGACY_LIB
   431 
   429 
   432   FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
   430   FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
       
   431 
       
   432   CC="$CC_OLD"
       
   433   CXX="$CXX_OLD"
       
   434   CFLAGS="$CFLAGS_OLD"
       
   435   CXXFLAGS="$CXXFLAGS_OLD"
   433 ])
   436 ])
   434 
   437 
   435 ################################################################################
   438 ################################################################################
   436 # platform independent
   439 # platform independent
   437 AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   440 AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],