Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Fri Jun 14 13:30:14 2013 +0200
     1.2 +++ b/common/autoconf/generated-configure.sh	Tue Jun 18 11:29:34 2013 +0200
     1.3 @@ -3782,7 +3782,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1370949244
     1.8 +DATE_WHEN_GENERATED=1371547755
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -29144,7 +29144,6 @@
    1.13  
    1.14  case $COMPILER_TYPE in
    1.15    CC )
    1.16 -    D_FLAG="-g"
    1.17      case $COMPILER_NAME in
    1.18        gcc )
    1.19        	case $OPENJDK_TARGET_OS in
    1.20 @@ -29159,17 +29158,17 @@
    1.21  	    C_O_FLAG_HI="-O3"
    1.22  	    C_O_FLAG_NORM="-O2"
    1.23  	    C_O_FLAG_NONE="-O0"
    1.24 -	    CFLAGS_DEBUG_SYMBOLS="-g"
    1.25 -	    CXXFLAGS_DEBUG_SYMBOLS="-g"
    1.26 -	    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
    1.27 -	       CFLAGS_DEBUG_SYMBOLS="-g1"
    1.28 -	       CXXFLAGS_DEBUG_SYMBOLS="-g1"
    1.29 -	    fi
    1.30  	    ;;
    1.31  	esac
    1.32          CXX_O_FLAG_HI="$C_O_FLAG_HI"
    1.33          CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
    1.34          CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
    1.35 +        CFLAGS_DEBUG_SYMBOLS="-g"
    1.36 +        CXXFLAGS_DEBUG_SYMBOLS="-g"
    1.37 +        if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
    1.38 +            CFLAGS_DEBUG_SYMBOLS="-g1"
    1.39 +            CXXFLAGS_DEBUG_SYMBOLS="-g1"
    1.40 +        fi
    1.41          ;;
    1.42        ossc )
    1.43          #
    1.44 @@ -29250,7 +29249,6 @@
    1.45      esac
    1.46      ;;
    1.47    CL )
    1.48 -    D_FLAG=
    1.49      C_O_FLAG_HIGHEST="-O2"
    1.50      C_O_FLAG_HI="-O1"
    1.51      C_O_FLAG_NORM="-O1"
    1.52 @@ -29389,6 +29387,28 @@
    1.53  
    1.54  ###############################################################################
    1.55  
    1.56 +# Adjust flags according to debug level.
    1.57 +case $DEBUG_LEVEL in
    1.58 +      fastdebug )
    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_NORM"
    1.62 +	      C_O_FLAG_NORM="$C_O_FLAG_NORM"
    1.63 +	      CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
    1.64 +	      CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
    1.65 +              JAVAC_FLAGS="$JAVAC_FLAGS -g"
    1.66 +              ;;
    1.67 +      slowdebug )
    1.68 +              CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
    1.69 +              CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
    1.70 +	      C_O_FLAG_HI="$C_O_FLAG_NONE"
    1.71 +	      C_O_FLAG_NORM="$C_O_FLAG_NONE"
    1.72 +	      CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
    1.73 +	      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
    1.74 +              JAVAC_FLAGS="$JAVAC_FLAGS -g"
    1.75 +              ;;
    1.76 +esac
    1.77 +
    1.78  CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
    1.79  
    1.80  # The package path is used only on macosx?
    1.81 @@ -29532,23 +29552,6 @@
    1.82      fi
    1.83  fi
    1.84  
    1.85 -# Adjust flags according to debug level.
    1.86 -case $DEBUG_LEVEL in
    1.87 -      fastdebug )
    1.88 -              CFLAGS="$CFLAGS $D_FLAG"
    1.89 -              JAVAC_FLAGS="$JAVAC_FLAGS -g"
    1.90 -              ;;
    1.91 -      slowdebug )
    1.92 -              CFLAGS="$CFLAGS $D_FLAG"
    1.93 -	      C_O_FLAG_HI="$C_O_FLAG_NONE"
    1.94 -	      C_O_FLAG_NORM="$C_O_FLAG_NONE"
    1.95 -	      CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
    1.96 -	      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
    1.97 -              JAVAC_FLAGS="$JAVAC_FLAGS -g"
    1.98 -              ;;
    1.99 -esac
   1.100 -
   1.101 -
   1.102  
   1.103  
   1.104  

     2.1 --- a/common/autoconf/toolchain.m4	Fri Jun 14 13:30:14 2013 +0200
     2.2 +++ b/common/autoconf/toolchain.m4	Tue Jun 18 11:29:34 2013 +0200
     2.3 @@ -629,7 +629,6 @@
     2.4  
     2.5  case $COMPILER_TYPE in
     2.6    CC )
     2.7 -    D_FLAG="-g"
     2.8      case $COMPILER_NAME in
     2.9        gcc )
    2.10        	case $OPENJDK_TARGET_OS in
    2.11 @@ -644,17 +643,17 @@
    2.12  	    C_O_FLAG_HI="-O3"
    2.13  	    C_O_FLAG_NORM="-O2"
    2.14  	    C_O_FLAG_NONE="-O0"
    2.15 -	    CFLAGS_DEBUG_SYMBOLS="-g"
    2.16 -	    CXXFLAGS_DEBUG_SYMBOLS="-g"
    2.17 -	    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
    2.18 -	       CFLAGS_DEBUG_SYMBOLS="-g1"
    2.19 -	       CXXFLAGS_DEBUG_SYMBOLS="-g1"
    2.20 -	    fi
    2.21  	    ;;
    2.22  	esac
    2.23          CXX_O_FLAG_HI="$C_O_FLAG_HI"
    2.24          CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
    2.25          CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
    2.26 +        CFLAGS_DEBUG_SYMBOLS="-g"
    2.27 +        CXXFLAGS_DEBUG_SYMBOLS="-g"
    2.28 +        if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
    2.29 +            CFLAGS_DEBUG_SYMBOLS="-g1"
    2.30 +            CXXFLAGS_DEBUG_SYMBOLS="-g1"
    2.31 +        fi
    2.32          ;;
    2.33        ossc )
    2.34          #
    2.35 @@ -735,7 +734,6 @@
    2.36      esac
    2.37      ;;
    2.38    CL )
    2.39 -    D_FLAG=
    2.40      C_O_FLAG_HIGHEST="-O2"
    2.41      C_O_FLAG_HI="-O1"
    2.42      C_O_FLAG_NORM="-O1"
    2.43 @@ -861,6 +859,28 @@
    2.44  
    2.45  ###############################################################################
    2.46  
    2.47 +# Adjust flags according to debug level.
    2.48 +case $DEBUG_LEVEL in
    2.49 +      fastdebug )
    2.50 +              CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
    2.51 +              CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
    2.52 +	      C_O_FLAG_HI="$C_O_FLAG_NORM"
    2.53 +	      C_O_FLAG_NORM="$C_O_FLAG_NORM"
    2.54 +	      CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
    2.55 +	      CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
    2.56 +              JAVAC_FLAGS="$JAVAC_FLAGS -g"
    2.57 +              ;;
    2.58 +      slowdebug )
    2.59 +              CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
    2.60 +              CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
    2.61 +	      C_O_FLAG_HI="$C_O_FLAG_NONE"
    2.62 +	      C_O_FLAG_NORM="$C_O_FLAG_NONE"
    2.63 +	      CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
    2.64 +	      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
    2.65 +              JAVAC_FLAGS="$JAVAC_FLAGS -g"
    2.66 +              ;;
    2.67 +esac
    2.68 +
    2.69  CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
    2.70  
    2.71  # The package path is used only on macosx?
    2.72 @@ -1004,23 +1024,6 @@
    2.73      fi
    2.74  fi
    2.75  
    2.76 -# Adjust flags according to debug level.
    2.77 -case $DEBUG_LEVEL in
    2.78 -      fastdebug )
    2.79 -              CFLAGS="$CFLAGS $D_FLAG"
    2.80 -              JAVAC_FLAGS="$JAVAC_FLAGS -g"
    2.81 -              ;;
    2.82 -      slowdebug )
    2.83 -              CFLAGS="$CFLAGS $D_FLAG"
    2.84 -	      C_O_FLAG_HI="$C_O_FLAG_NONE"
    2.85 -	      C_O_FLAG_NORM="$C_O_FLAG_NONE"
    2.86 -	      CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
    2.87 -	      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
    2.88 -              JAVAC_FLAGS="$JAVAC_FLAGS -g"
    2.89 -              ;;
    2.90 -esac
    2.91 -
    2.92 -
    2.93  AC_SUBST(CFLAGS_JDKLIB)
    2.94  AC_SUBST(CFLAGS_JDKEXE)
    2.95