Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Wed, 12 Dec 2012 13:19:32 -0800
- author
- katleman
- date
- Wed, 12 Dec 2012 13:19:32 -0800
- changeset 534
- cdb401a60cea
- parent 530
- 04435608c613
- parent 533
- e175ecff1391
- child 535
- e9ec00893bb4
- child 538
- 8e36a0fabf58
Merge
1.1 --- a/common/autoconf/generated-configure.sh Mon Dec 10 20:52:08 2012 -0800 1.2 +++ b/common/autoconf/generated-configure.sh Wed Dec 12 13:19:32 2012 -0800 1.3 @@ -708,6 +708,7 @@ 1.4 ac_ct_PROPER_COMPILER_CXX 1.5 PROPER_COMPILER_CXX 1.6 POTENTIAL_CXX 1.7 +TOOLS_DIR_CXX 1.8 OBJEXT 1.9 EXEEXT 1.10 ac_ct_CC 1.11 @@ -718,6 +719,7 @@ 1.12 ac_ct_PROPER_COMPILER_CC 1.13 PROPER_COMPILER_CC 1.14 POTENTIAL_CC 1.15 +TOOLS_DIR_CC 1.16 BUILD_LD 1.17 BUILD_CXX 1.18 BUILD_CC 1.19 @@ -3672,7 +3674,7 @@ 1.20 #CUSTOM_AUTOCONF_INCLUDE 1.21 1.22 # Do not change or remove the following line, it is needed for consistency checks: 1.23 -DATE_WHEN_GENERATED=1354721616 1.24 +DATE_WHEN_GENERATED=1355221914 1.25 1.26 ############################################################################### 1.27 # 1.28 @@ -17786,10 +17788,65 @@ 1.29 1.30 COMPILER_NAME=C 1.31 1.32 - # Do a first initial attempt at searching the list of compiler names. 1.33 + CC= 1.34 + # If TOOLS_DIR is set, check for all compiler names in there first 1.35 + # before checking the rest of the PATH. 1.36 + if test -n "$TOOLS_DIR"; then 1.37 + PATH_save="$PATH" 1.38 + PATH="$TOOLS_DIR" 1.39 + for ac_prog in $COMPILER_CHECK_LIST 1.40 +do 1.41 + # Extract the first word of "$ac_prog", so it can be a program name with args. 1.42 +set dummy $ac_prog; ac_word=$2 1.43 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.44 +$as_echo_n "checking for $ac_word... " >&6; } 1.45 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 1.46 + $as_echo_n "(cached) " >&6 1.47 +else 1.48 + case $TOOLS_DIR_CC in 1.49 + [\\/]* | ?:[\\/]*) 1.50 + ac_cv_path_TOOLS_DIR_CC="$TOOLS_DIR_CC" # Let the user override the test with a path. 1.51 + ;; 1.52 + *) 1.53 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.54 +for as_dir in $PATH 1.55 +do 1.56 + IFS=$as_save_IFS 1.57 + test -z "$as_dir" && as_dir=. 1.58 + for ac_exec_ext in '' $ac_executable_extensions; do 1.59 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1.60 + ac_cv_path_TOOLS_DIR_CC="$as_dir/$ac_word$ac_exec_ext" 1.61 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1.62 + break 2 1.63 + fi 1.64 +done 1.65 + done 1.66 +IFS=$as_save_IFS 1.67 + 1.68 + ;; 1.69 +esac 1.70 +fi 1.71 +TOOLS_DIR_CC=$ac_cv_path_TOOLS_DIR_CC 1.72 +if test -n "$TOOLS_DIR_CC"; then 1.73 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLS_DIR_CC" >&5 1.74 +$as_echo "$TOOLS_DIR_CC" >&6; } 1.75 +else 1.76 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 1.77 +$as_echo "no" >&6; } 1.78 +fi 1.79 + 1.80 + 1.81 + test -n "$TOOLS_DIR_CC" && break 1.82 +done 1.83 + 1.84 + CC=$TOOLS_DIR_CC 1.85 + PATH="$PATH_save" 1.86 + fi 1.87 + 1.88 # AC_PATH_PROGS can't be run multiple times with the same variable, 1.89 # so create a new name for this run. 1.90 - for ac_prog in $COMPILER_CHECK_LIST 1.91 + if test "x$CC" = x; then 1.92 + for ac_prog in $COMPILER_CHECK_LIST 1.93 do 1.94 # Extract the first word of "$ac_prog", so it can be a program name with args. 1.95 set dummy $ac_prog; ac_word=$2 1.96 @@ -17834,9 +17891,10 @@ 1.97 test -n "$POTENTIAL_CC" && break 1.98 done 1.99 1.100 - CC=$POTENTIAL_CC 1.101 - 1.102 - if test "x$$CC" = x; then 1.103 + CC=$POTENTIAL_CC 1.104 + fi 1.105 + 1.106 + if test "x$CC" = x; then 1.107 1.108 # Print a helpful message on how to acquire the necessary build dependency. 1.109 # devkit is the help tag: freetyp2, cups, pulse, alsa etc 1.110 @@ -19277,10 +19335,65 @@ 1.111 1.112 COMPILER_NAME=C++ 1.113 1.114 - # Do a first initial attempt at searching the list of compiler names. 1.115 + CXX= 1.116 + # If TOOLS_DIR is set, check for all compiler names in there first 1.117 + # before checking the rest of the PATH. 1.118 + if test -n "$TOOLS_DIR"; then 1.119 + PATH_save="$PATH" 1.120 + PATH="$TOOLS_DIR" 1.121 + for ac_prog in $COMPILER_CHECK_LIST 1.122 +do 1.123 + # Extract the first word of "$ac_prog", so it can be a program name with args. 1.124 +set dummy $ac_prog; ac_word=$2 1.125 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.126 +$as_echo_n "checking for $ac_word... " >&6; } 1.127 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 1.128 + $as_echo_n "(cached) " >&6 1.129 +else 1.130 + case $TOOLS_DIR_CXX in 1.131 + [\\/]* | ?:[\\/]*) 1.132 + ac_cv_path_TOOLS_DIR_CXX="$TOOLS_DIR_CXX" # Let the user override the test with a path. 1.133 + ;; 1.134 + *) 1.135 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.136 +for as_dir in $PATH 1.137 +do 1.138 + IFS=$as_save_IFS 1.139 + test -z "$as_dir" && as_dir=. 1.140 + for ac_exec_ext in '' $ac_executable_extensions; do 1.141 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1.142 + ac_cv_path_TOOLS_DIR_CXX="$as_dir/$ac_word$ac_exec_ext" 1.143 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 1.144 + break 2 1.145 + fi 1.146 +done 1.147 + done 1.148 +IFS=$as_save_IFS 1.149 + 1.150 + ;; 1.151 +esac 1.152 +fi 1.153 +TOOLS_DIR_CXX=$ac_cv_path_TOOLS_DIR_CXX 1.154 +if test -n "$TOOLS_DIR_CXX"; then 1.155 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLS_DIR_CXX" >&5 1.156 +$as_echo "$TOOLS_DIR_CXX" >&6; } 1.157 +else 1.158 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 1.159 +$as_echo "no" >&6; } 1.160 +fi 1.161 + 1.162 + 1.163 + test -n "$TOOLS_DIR_CXX" && break 1.164 +done 1.165 + 1.166 + CXX=$TOOLS_DIR_CXX 1.167 + PATH="$PATH_save" 1.168 + fi 1.169 + 1.170 # AC_PATH_PROGS can't be run multiple times with the same variable, 1.171 # so create a new name for this run. 1.172 - for ac_prog in $COMPILER_CHECK_LIST 1.173 + if test "x$CXX" = x; then 1.174 + for ac_prog in $COMPILER_CHECK_LIST 1.175 do 1.176 # Extract the first word of "$ac_prog", so it can be a program name with args. 1.177 set dummy $ac_prog; ac_word=$2 1.178 @@ -19325,9 +19438,10 @@ 1.179 test -n "$POTENTIAL_CXX" && break 1.180 done 1.181 1.182 - CXX=$POTENTIAL_CXX 1.183 - 1.184 - if test "x$$CXX" = x; then 1.185 + CXX=$POTENTIAL_CXX 1.186 + fi 1.187 + 1.188 + if test "x$CXX" = x; then 1.189 1.190 # Print a helpful message on how to acquire the necessary build dependency. 1.191 # devkit is the help tag: freetyp2, cups, pulse, alsa etc 1.192 @@ -27706,34 +27820,34 @@ 1.193 # ENABLE_DEBUG_SYMBOLS 1.194 # This must be done after the toolchain is setup, since we're looking at objcopy. 1.195 # 1.196 -ENABLE_DEBUG_SYMBOLS=default 1.197 - 1.198 -# default on macosx is no... 1.199 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then 1.200 - ENABLE_DEBUG_SYMBOLS=no 1.201 -fi 1.202 - 1.203 # Check whether --enable-debug-symbols was given. 1.204 if test "${enable_debug_symbols+set}" = set; then : 1.205 - enableval=$enable_debug_symbols; ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols} 1.206 + enableval=$enable_debug_symbols; 1.207 fi 1.208 1.209 1.210 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols" >&5 1.211 $as_echo_n "checking if we should generate debug symbols... " >&6; } 1.212 1.213 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xyes" && test "x$OBJCOPY" = x; then 1.214 +if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then 1.215 # explicit enabling of enable-debug-symbols and can't find objcopy 1.216 # this is an error 1.217 as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5 1.218 fi 1.219 1.220 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then 1.221 +if test "x$enable_debug_symbols" = "xyes"; then 1.222 + ENABLE_DEBUG_SYMBOLS=true 1.223 +elif test "x$enable_debug_symbols" = "xno"; then 1.224 + ENABLE_DEBUG_SYMBOLS=false 1.225 +else 1.226 + # default on macosx is false 1.227 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then 1.228 + ENABLE_DEBUG_SYMBOLS=false 1.229 # Default is on if objcopy is found, otherwise off 1.230 - if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 1.231 - ENABLE_DEBUG_SYMBOLS=yes 1.232 - else 1.233 - ENABLE_DEBUG_SYMBOLS=no 1.234 + elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 1.235 + ENABLE_DEBUG_SYMBOLS=true 1.236 + else 1.237 + ENABLE_DEBUG_SYMBOLS=false 1.238 fi 1.239 fi 1.240 1.241 @@ -27743,25 +27857,21 @@ 1.242 # 1.243 # ZIP_DEBUGINFO_FILES 1.244 # 1.245 -ZIP_DEBUGINFO_FILES=yes 1.246 - 1.247 # Check whether --enable-zip-debug-info was given. 1.248 if test "${enable_zip_debug_info+set}" = set; then : 1.249 - enableval=$enable_zip_debug_info; ZIP_DEBUGINFO_FILES=${enable_zip_debug_info} 1.250 + enableval=$enable_zip_debug_info; 1.251 fi 1.252 1.253 1.254 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5 1.255 $as_echo_n "checking if we should zip debug-info files... " >&6; } 1.256 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP_DEBUGINFO_FILES" >&5 1.257 -$as_echo "$ZIP_DEBUGINFO_FILES" >&6; } 1.258 - 1.259 -# Hotspot wants ZIP_DEBUGINFO_FILES to be 1 for yes 1.260 -# use that... 1.261 -if test "x$ZIP_DEBUGINFO_FILES" = "xyes"; then 1.262 - ZIP_DEBUGINFO_FILES=1 1.263 -else 1.264 - ZIP_DEBUGINFO_FILES=0 1.265 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5 1.266 +$as_echo "${enable_zip_debug_info}" >&6; } 1.267 + 1.268 +if test "x${enable_zip_debug_info}" = "xno"; then 1.269 + ZIP_DEBUGINFO_FILES=false 1.270 +else 1.271 + ZIP_DEBUGINFO_FILES=true 1.272 fi 1.273 1.274
2.1 --- a/common/autoconf/hotspot-spec.gmk.in Mon Dec 10 20:52:08 2012 -0800 2.2 +++ b/common/autoconf/hotspot-spec.gmk.in Wed Dec 12 13:19:32 2012 -0800 2.3 @@ -97,6 +97,24 @@ 2.4 2.5 USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@ 2.6 2.7 +# Hotspot expects the variable FULL_DEBUG_SYMBOLS=1/0 to control debug symbols 2.8 +# creation. 2.9 +ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 2.10 + FULL_DEBUG_SYMBOLS=1 2.11 + # Ensure hotspot uses the objcopy that configure located 2.12 + ALT_OBJCOPY:=$(OBJCOPY) 2.13 +else 2.14 + FULL_DEBUG_SYMBOLS=0 2.15 +endif 2.16 + 2.17 +# Hotspot expects the variable ZIP_DEBUGINFO_FILES=1/0 and not true/false. 2.18 +ifeq ($(ZIP_DEBUGINFO_FILES)$(ENABLE_DEBUG_SYMBOLS), truetrue) 2.19 + ZIP_DEBUGINFO_FILES:=1 2.20 +endif 2.21 +ifeq ($(ZIP_DEBUGINFO_FILES), false) 2.22 + ZIP_DEBUGINFO_FILES:=0 2.23 +endif 2.24 + 2.25 # Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files. 2.26 # This is needed to get the LOG setting to work properly. 2.27 include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
3.1 --- a/common/autoconf/jdk-options.m4 Mon Dec 10 20:52:08 2012 -0800 3.2 +++ b/common/autoconf/jdk-options.m4 Wed Dec 12 13:19:32 2012 -0800 3.3 @@ -432,32 +432,30 @@ 3.4 # ENABLE_DEBUG_SYMBOLS 3.5 # This must be done after the toolchain is setup, since we're looking at objcopy. 3.6 # 3.7 -ENABLE_DEBUG_SYMBOLS=default 3.8 - 3.9 -# default on macosx is no... 3.10 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then 3.11 - ENABLE_DEBUG_SYMBOLS=no 3.12 -fi 3.13 - 3.14 AC_ARG_ENABLE([debug-symbols], 3.15 - [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])], 3.16 - [ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols}], 3.17 -) 3.18 + [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])]) 3.19 3.20 AC_MSG_CHECKING([if we should generate debug symbols]) 3.21 3.22 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xyes" && test "x$OBJCOPY" = x; then 3.23 +if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then 3.24 # explicit enabling of enable-debug-symbols and can't find objcopy 3.25 # this is an error 3.26 AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols]) 3.27 fi 3.28 3.29 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then 3.30 +if test "x$enable_debug_symbols" = "xyes"; then 3.31 + ENABLE_DEBUG_SYMBOLS=true 3.32 +elif test "x$enable_debug_symbols" = "xno"; then 3.33 + ENABLE_DEBUG_SYMBOLS=false 3.34 +else 3.35 + # default on macosx is false 3.36 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then 3.37 + ENABLE_DEBUG_SYMBOLS=false 3.38 # Default is on if objcopy is found, otherwise off 3.39 - if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 3.40 - ENABLE_DEBUG_SYMBOLS=yes 3.41 + elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 3.42 + ENABLE_DEBUG_SYMBOLS=true 3.43 else 3.44 - ENABLE_DEBUG_SYMBOLS=no 3.45 + ENABLE_DEBUG_SYMBOLS=false 3.46 fi 3.47 fi 3.48 3.49 @@ -466,22 +464,16 @@ 3.50 # 3.51 # ZIP_DEBUGINFO_FILES 3.52 # 3.53 -ZIP_DEBUGINFO_FILES=yes 3.54 - 3.55 AC_ARG_ENABLE([zip-debug-info], 3.56 - [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])], 3.57 - [ZIP_DEBUGINFO_FILES=${enable_zip_debug_info}], 3.58 -) 3.59 + [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])]) 3.60 3.61 AC_MSG_CHECKING([if we should zip debug-info files]) 3.62 -AC_MSG_RESULT([$ZIP_DEBUGINFO_FILES]) 3.63 +AC_MSG_RESULT([${enable_zip_debug_info}]) 3.64 3.65 -# Hotspot wants ZIP_DEBUGINFO_FILES to be 1 for yes 3.66 -# use that... 3.67 -if test "x$ZIP_DEBUGINFO_FILES" = "xyes"; then 3.68 - ZIP_DEBUGINFO_FILES=1 3.69 +if test "x${enable_zip_debug_info}" = "xno"; then 3.70 + ZIP_DEBUGINFO_FILES=false 3.71 else 3.72 - ZIP_DEBUGINFO_FILES=0 3.73 + ZIP_DEBUGINFO_FILES=true 3.74 fi 3.75 3.76 AC_SUBST(ENABLE_DEBUG_SYMBOLS)
4.1 --- a/common/autoconf/toolchain.m4 Mon Dec 10 20:52:08 2012 -0800 4.2 +++ b/common/autoconf/toolchain.m4 Wed Dec 12 13:19:32 2012 -0800 4.3 @@ -114,13 +114,25 @@ 4.4 [ 4.5 COMPILER_NAME=$2 4.6 4.7 - # Do a first initial attempt at searching the list of compiler names. 4.8 + $1= 4.9 + # If TOOLS_DIR is set, check for all compiler names in there first 4.10 + # before checking the rest of the PATH. 4.11 + if test -n "$TOOLS_DIR"; then 4.12 + PATH_save="$PATH" 4.13 + PATH="$TOOLS_DIR" 4.14 + AC_PATH_PROGS(TOOLS_DIR_$1, $3) 4.15 + $1=$TOOLS_DIR_$1 4.16 + PATH="$PATH_save" 4.17 + fi 4.18 + 4.19 # AC_PATH_PROGS can't be run multiple times with the same variable, 4.20 # so create a new name for this run. 4.21 - AC_PATH_PROGS(POTENTIAL_$1, $3) 4.22 - $1=$POTENTIAL_$1 4.23 + if test "x[$]$1" = x; then 4.24 + AC_PATH_PROGS(POTENTIAL_$1, $3) 4.25 + $1=$POTENTIAL_$1 4.26 + fi 4.27 4.28 - if test "x$[$]$1" = x; then 4.29 + if test "x[$]$1" = x; then 4.30 HELP_MSG_MISSING_DEPENDENCY([devkit]) 4.31 AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG]) 4.32 fi
5.1 --- a/common/makefiles/JavaCompilation.gmk Mon Dec 10 20:52:08 2012 -0800 5.2 +++ b/common/makefiles/JavaCompilation.gmk Wed Dec 12 13:19:32 2012 -0800 5.3 @@ -275,10 +275,12 @@ 5.4 # Explicitly excluded files can be given with absolute path. The patsubst solution 5.5 # isn't perfect but the likelyhood of an absolute path to match something in a src 5.6 # dir is very small. 5.7 + # If zip has nothing to do, it returns 12 and would fail the build. Check for 12 5.8 + # and only fail if it's not. 5.9 $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS) 5.10 $(MKDIR) -p $$(@D) 5.11 $(ECHO) Updating $$($1_NAME) 5.12 - $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))))$$(NEWLINE)) true 5.13 + $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true 5.14 $(TOUCH) $$@ 5.15 endef 5.16
6.1 --- a/common/makefiles/NativeCompilation.gmk Mon Dec 10 20:52:08 2012 -0800 6.2 +++ b/common/makefiles/NativeCompilation.gmk Wed Dec 12 13:19:32 2012 -0800 6.3 @@ -302,7 +302,7 @@ 6.4 endif 6.5 6.6 ifneq (,$$($1_DEBUG_SYMBOLS)) 6.7 - ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 6.8 + ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 6.9 # Programs don't get the debug symbols added in the old build. It's not clear if 6.10 # this is intentional. 6.11 ifeq ($$($1_PROGRAM),) 6.12 @@ -394,7 +394,7 @@ 6.13 endif 6.14 6.15 ifneq (,$$($1_DEBUG_SYMBOLS)) 6.16 - ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 6.17 + ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 6.18 ifeq ($(OPENJDK_TARGET_OS), windows) 6.19 $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \ 6.20 "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map" 6.21 @@ -429,7 +429,7 @@ 6.22 endif # Touch to not retrigger rule on rebuild 6.23 $(TOUCH) $$@ 6.24 6.25 - ifeq ($(ZIP_DEBUGINFO_FILES), 1) 6.26 + ifeq ($(ZIP_DEBUGINFO_FILES), true) 6.27 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz 6.28 6.29 ifeq ($(OPENJDK_TARGET_OS), windows) 6.30 @@ -472,7 +472,7 @@ 6.31 ifneq (,$$($1_PROGRAM)) 6.32 # A executable binary has been specified, setup the target for it. 6.33 ifneq (,$$($1_DEBUG_SYMBOLS)) 6.34 - ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 6.35 + ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 6.36 ifeq ($(OPENJDK_TARGET_OS), windows) 6.37 $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \ 6.38 "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map" 6.39 @@ -507,7 +507,7 @@ 6.40 endif 6.41 $(TOUCH) $$@ 6.42 6.43 - ifeq ($(ZIP_DEBUGINFO_FILES), 1) 6.44 + ifeq ($(ZIP_DEBUGINFO_FILES), true) 6.45 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz 6.46 6.47 ifeq ($(OPENJDK_TARGET_OS), windows)
