1.1 --- a/common/autoconf/toolchain.m4 Fri Jun 14 13:30:14 2013 +0200
1.2 +++ b/common/autoconf/toolchain.m4 Tue Jun 18 11:29:34 2013 +0200
1.3 @@ -629,7 +629,6 @@
1.4
1.5 case $COMPILER_TYPE in
1.6 CC )
1.7 - D_FLAG="-g"
1.8 case $COMPILER_NAME in
1.9 gcc )
1.10 case $OPENJDK_TARGET_OS in
1.11 @@ -644,17 +643,17 @@
1.12 C_O_FLAG_HI="-O3"
1.13 C_O_FLAG_NORM="-O2"
1.14 C_O_FLAG_NONE="-O0"
1.15 - CFLAGS_DEBUG_SYMBOLS="-g"
1.16 - CXXFLAGS_DEBUG_SYMBOLS="-g"
1.17 - if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
1.18 - CFLAGS_DEBUG_SYMBOLS="-g1"
1.19 - CXXFLAGS_DEBUG_SYMBOLS="-g1"
1.20 - fi
1.21 ;;
1.22 esac
1.23 CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.24 CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.25 CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.26 + CFLAGS_DEBUG_SYMBOLS="-g"
1.27 + CXXFLAGS_DEBUG_SYMBOLS="-g"
1.28 + if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
1.29 + CFLAGS_DEBUG_SYMBOLS="-g1"
1.30 + CXXFLAGS_DEBUG_SYMBOLS="-g1"
1.31 + fi
1.32 ;;
1.33 ossc )
1.34 #
1.35 @@ -735,7 +734,6 @@
1.36 esac
1.37 ;;
1.38 CL )
1.39 - D_FLAG=
1.40 C_O_FLAG_HIGHEST="-O2"
1.41 C_O_FLAG_HI="-O1"
1.42 C_O_FLAG_NORM="-O1"
1.43 @@ -861,6 +859,28 @@
1.44
1.45 ###############################################################################
1.46
1.47 +# Adjust flags according to debug level.
1.48 +case $DEBUG_LEVEL in
1.49 + fastdebug )
1.50 + CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
1.51 + CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
1.52 + C_O_FLAG_HI="$C_O_FLAG_NORM"
1.53 + C_O_FLAG_NORM="$C_O_FLAG_NORM"
1.54 + CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
1.55 + CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
1.56 + JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.57 + ;;
1.58 + slowdebug )
1.59 + CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
1.60 + CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
1.61 + C_O_FLAG_HI="$C_O_FLAG_NONE"
1.62 + C_O_FLAG_NORM="$C_O_FLAG_NONE"
1.63 + CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
1.64 + CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
1.65 + JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.66 + ;;
1.67 +esac
1.68 +
1.69 CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
1.70
1.71 # The package path is used only on macosx?
1.72 @@ -1004,23 +1024,6 @@
1.73 fi
1.74 fi
1.75
1.76 -# Adjust flags according to debug level.
1.77 -case $DEBUG_LEVEL in
1.78 - fastdebug )
1.79 - CFLAGS="$CFLAGS $D_FLAG"
1.80 - JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.81 - ;;
1.82 - slowdebug )
1.83 - CFLAGS="$CFLAGS $D_FLAG"
1.84 - C_O_FLAG_HI="$C_O_FLAG_NONE"
1.85 - C_O_FLAG_NORM="$C_O_FLAG_NONE"
1.86 - CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
1.87 - CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
1.88 - JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.89 - ;;
1.90 -esac
1.91 -
1.92 -
1.93 AC_SUBST(CFLAGS_JDKLIB)
1.94 AC_SUBST(CFLAGS_JDKEXE)
1.95
