Mercurial > jdk8-mips64-public / changeset
changeset
8006288: build-infra: Use solaris nm and not gnm on solaris
Tue, 09 Apr 2013 09:42:20 +0200
- author
- erikj
- date
- Tue, 09 Apr 2013 09:42:20 +0200
- changeset 672
- 2f43964043c2
- parent 671
- 653ff6bcf0b1
- child 673
- 2ef28c12d649
8006288: build-infra: Use solaris nm and not gnm on solaris
Reviewed-by: tbell
1.1 --- a/common/autoconf/compare.sh.in Mon Apr 08 14:07:32 2013 -0400 1.2 +++ b/common/autoconf/compare.sh.in Tue Apr 09 09:42:20 2013 +0200 1.3 @@ -49,7 +49,7 @@ 1.4 LDD="@LDD@" 1.5 MKDIR="@MKDIR@" 1.6 NAWK="@NAWK@" 1.7 -NM="@NM@" 1.8 +NM="@GNM@" 1.9 OBJDUMP="@OBJDUMP@" 1.10 OTOOL="@OTOOL@" 1.11 PRINTF="@PRINTF@"
2.1 --- a/common/autoconf/generated-configure.sh Mon Apr 08 14:07:32 2013 -0400 2.2 +++ b/common/autoconf/generated-configure.sh Tue Apr 09 09:42:20 2013 +0200 2.3 @@ -686,6 +686,7 @@ 2.4 OBJCOPY 2.5 MCS 2.6 STRIP 2.7 +GNM 2.8 NM 2.9 AS 2.10 CXXCPP 2.11 @@ -3763,7 +3764,7 @@ 2.12 #CUSTOM_AUTOCONF_INCLUDE 2.13 2.14 # Do not change or remove the following line, it is needed for consistency checks: 2.15 -DATE_WHEN_GENERATED=1365147397 2.16 +DATE_WHEN_GENERATED=1365493306 2.17 2.18 ############################################################################### 2.19 # 2.20 @@ -25200,10 +25201,8 @@ 2.21 2.22 2.23 if test "x$OPENJDK_TARGET_OS" = xsolaris; then 2.24 - for ac_prog in gnm nm 2.25 -do 2.26 - # Extract the first word of "$ac_prog", so it can be a program name with args. 2.27 -set dummy $ac_prog; ac_word=$2 2.28 + # Extract the first word of "nm", so it can be a program name with args. 2.29 +set dummy nm; ac_word=$2 2.30 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.31 $as_echo_n "checking for $ac_word... " >&6; } 2.32 if test "${ac_cv_path_NM+set}" = set; then : 2.33 @@ -25242,9 +25241,6 @@ 2.34 fi 2.35 2.36 2.37 - test -n "$NM" && break 2.38 -done 2.39 - 2.40 2.41 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.42 2.43 @@ -25511,52 +25507,52 @@ 2.44 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;} 2.45 fi 2.46 2.47 - # Extract the first word of "strip", so it can be a program name with args. 2.48 -set dummy strip; ac_word=$2 2.49 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.50 -$as_echo_n "checking for $ac_word... " >&6; } 2.51 -if test "${ac_cv_path_STRIP+set}" = set; then : 2.52 - $as_echo_n "(cached) " >&6 2.53 -else 2.54 - case $STRIP in 2.55 - [\\/]* | ?:[\\/]*) 2.56 - ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path. 2.57 - ;; 2.58 - *) 2.59 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.60 -for as_dir in $PATH 2.61 -do 2.62 - IFS=$as_save_IFS 2.63 - test -z "$as_dir" && as_dir=. 2.64 - for ac_exec_ext in '' $ac_executable_extensions; do 2.65 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.66 - ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext" 2.67 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.68 - break 2 2.69 - fi 2.70 -done 2.71 - done 2.72 -IFS=$as_save_IFS 2.73 - 2.74 - ;; 2.75 -esac 2.76 -fi 2.77 -STRIP=$ac_cv_path_STRIP 2.78 -if test -n "$STRIP"; then 2.79 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 2.80 -$as_echo "$STRIP" >&6; } 2.81 -else 2.82 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.83 -$as_echo "no" >&6; } 2.84 -fi 2.85 - 2.86 - 2.87 - 2.88 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.89 - 2.90 - # First separate the path from the arguments. This will split at the first 2.91 - # space. 2.92 - complete="$STRIP" 2.93 + # Extract the first word of "gnm", so it can be a program name with args. 2.94 +set dummy gnm; ac_word=$2 2.95 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.96 +$as_echo_n "checking for $ac_word... " >&6; } 2.97 +if test "${ac_cv_path_GNM+set}" = set; then : 2.98 + $as_echo_n "(cached) " >&6 2.99 +else 2.100 + case $GNM in 2.101 + [\\/]* | ?:[\\/]*) 2.102 + ac_cv_path_GNM="$GNM" # Let the user override the test with a path. 2.103 + ;; 2.104 + *) 2.105 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.106 +for as_dir in $PATH 2.107 +do 2.108 + IFS=$as_save_IFS 2.109 + test -z "$as_dir" && as_dir=. 2.110 + for ac_exec_ext in '' $ac_executable_extensions; do 2.111 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.112 + ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext" 2.113 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.114 + break 2 2.115 + fi 2.116 +done 2.117 + done 2.118 +IFS=$as_save_IFS 2.119 + 2.120 + ;; 2.121 +esac 2.122 +fi 2.123 +GNM=$ac_cv_path_GNM 2.124 +if test -n "$GNM"; then 2.125 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5 2.126 +$as_echo "$GNM" >&6; } 2.127 +else 2.128 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.129 +$as_echo "no" >&6; } 2.130 +fi 2.131 + 2.132 + 2.133 + 2.134 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.135 + 2.136 + # First separate the path from the arguments. This will split at the first 2.137 + # space. 2.138 + complete="$GNM" 2.139 path="${complete%% *}" 2.140 tmp="$complete EOL" 2.141 arguments="${tmp#* }" 2.142 @@ -25592,14 +25588,14 @@ 2.143 fi 2.144 if test "x$new_path" = x; then 2.145 # It's still not found. Now this is an unrecoverable error. 2.146 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 2.147 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;} 2.148 - has_space=`$ECHO "$complete" | $GREP " "` 2.149 - if test "x$has_space" != x; then 2.150 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.151 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.152 - fi 2.153 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 2.154 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5 2.155 +$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;} 2.156 + has_space=`$ECHO "$complete" | $GREP " "` 2.157 + if test "x$has_space" != x; then 2.158 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.159 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.160 + fi 2.161 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5 2.162 fi 2.163 fi 2.164 2.165 @@ -25619,11 +25615,11 @@ 2.166 elif test -f "${new_path}.cmd"; then 2.167 input_to_shortpath="${new_path}.cmd" 2.168 else 2.169 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5 2.170 -$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;} 2.171 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$new_path\", is invalid." >&5 2.172 +$as_echo "$as_me: The path of GNM, which resolves as \"$new_path\", is invalid." >&6;} 2.173 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5 2.174 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;} 2.175 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 2.176 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5 2.177 fi 2.178 else 2.179 input_to_shortpath="$new_path" 2.180 @@ -25670,7 +25666,7 @@ 2.181 2.182 # First separate the path from the arguments. This will split at the first 2.183 # space. 2.184 - complete="$STRIP" 2.185 + complete="$GNM" 2.186 path="${complete%% *}" 2.187 tmp="$complete EOL" 2.188 arguments="${tmp#* }" 2.189 @@ -25715,14 +25711,14 @@ 2.190 2.191 if test "x$new_path" = x; then 2.192 # It's still not found. Now this is an unrecoverable error. 2.193 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 2.194 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;} 2.195 - has_space=`$ECHO "$complete" | $GREP " "` 2.196 - if test "x$has_space" != x; then 2.197 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.198 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.199 - fi 2.200 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 2.201 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5 2.202 +$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;} 2.203 + has_space=`$ECHO "$complete" | $GREP " "` 2.204 + if test "x$has_space" != x; then 2.205 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.206 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.207 + fi 2.208 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5 2.209 fi 2.210 fi 2.211 2.212 @@ -25768,7 +25764,7 @@ 2.213 # We're on a posix platform. Hooray! :) 2.214 # First separate the path from the arguments. This will split at the first 2.215 # space. 2.216 - complete="$STRIP" 2.217 + complete="$GNM" 2.218 path="${complete%% *}" 2.219 tmp="$complete EOL" 2.220 arguments="${tmp#* }" 2.221 @@ -25787,20 +25783,20 @@ 2.222 done 2.223 IFS="$IFS_save" 2.224 else 2.225 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5 2.226 -$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;} 2.227 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving GNM (as $path) failed, using $path directly." >&5 2.228 +$as_echo "$as_me: Resolving GNM (as $path) failed, using $path directly." >&6;} 2.229 new_path="$path" 2.230 fi 2.231 2.232 if test "x$new_path" = x; then 2.233 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 2.234 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;} 2.235 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5 2.236 +$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;} 2.237 has_space=`$ECHO "$complete" | $GREP " "` 2.238 if test "x$has_space" != x; then 2.239 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 2.240 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} 2.241 fi 2.242 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 2.243 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5 2.244 fi 2.245 fi 2.246 2.247 @@ -25812,57 +25808,57 @@ 2.248 fi 2.249 2.250 if test "x$complete" != "x$new_complete"; then 2.251 - STRIP="$new_complete" 2.252 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5 2.253 -$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;} 2.254 - fi 2.255 - 2.256 - # Extract the first word of "mcs", so it can be a program name with args. 2.257 -set dummy mcs; ac_word=$2 2.258 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.259 -$as_echo_n "checking for $ac_word... " >&6; } 2.260 -if test "${ac_cv_path_MCS+set}" = set; then : 2.261 - $as_echo_n "(cached) " >&6 2.262 -else 2.263 - case $MCS in 2.264 - [\\/]* | ?:[\\/]*) 2.265 - ac_cv_path_MCS="$MCS" # Let the user override the test with a path. 2.266 - ;; 2.267 - *) 2.268 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.269 -for as_dir in $PATH 2.270 -do 2.271 - IFS=$as_save_IFS 2.272 - test -z "$as_dir" && as_dir=. 2.273 - for ac_exec_ext in '' $ac_executable_extensions; do 2.274 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.275 - ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext" 2.276 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.277 - break 2 2.278 - fi 2.279 -done 2.280 - done 2.281 -IFS=$as_save_IFS 2.282 - 2.283 - ;; 2.284 -esac 2.285 -fi 2.286 -MCS=$ac_cv_path_MCS 2.287 -if test -n "$MCS"; then 2.288 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5 2.289 -$as_echo "$MCS" >&6; } 2.290 -else 2.291 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.292 -$as_echo "no" >&6; } 2.293 -fi 2.294 - 2.295 - 2.296 - 2.297 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.298 - 2.299 - # First separate the path from the arguments. This will split at the first 2.300 - # space. 2.301 - complete="$MCS" 2.302 + GNM="$new_complete" 2.303 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting GNM to \"$new_complete\"" >&5 2.304 +$as_echo "$as_me: Rewriting GNM to \"$new_complete\"" >&6;} 2.305 + fi 2.306 + 2.307 + # Extract the first word of "strip", so it can be a program name with args. 2.308 +set dummy strip; ac_word=$2 2.309 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.310 +$as_echo_n "checking for $ac_word... " >&6; } 2.311 +if test "${ac_cv_path_STRIP+set}" = set; then : 2.312 + $as_echo_n "(cached) " >&6 2.313 +else 2.314 + case $STRIP in 2.315 + [\\/]* | ?:[\\/]*) 2.316 + ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path. 2.317 + ;; 2.318 + *) 2.319 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.320 +for as_dir in $PATH 2.321 +do 2.322 + IFS=$as_save_IFS 2.323 + test -z "$as_dir" && as_dir=. 2.324 + for ac_exec_ext in '' $ac_executable_extensions; do 2.325 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.326 + ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext" 2.327 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.328 + break 2 2.329 + fi 2.330 +done 2.331 + done 2.332 +IFS=$as_save_IFS 2.333 + 2.334 + ;; 2.335 +esac 2.336 +fi 2.337 +STRIP=$ac_cv_path_STRIP 2.338 +if test -n "$STRIP"; then 2.339 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 2.340 +$as_echo "$STRIP" >&6; } 2.341 +else 2.342 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.343 +$as_echo "no" >&6; } 2.344 +fi 2.345 + 2.346 + 2.347 + 2.348 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.349 + 2.350 + # First separate the path from the arguments. This will split at the first 2.351 + # space. 2.352 + complete="$STRIP" 2.353 path="${complete%% *}" 2.354 tmp="$complete EOL" 2.355 arguments="${tmp#* }" 2.356 @@ -25898,14 +25894,14 @@ 2.357 fi 2.358 if test "x$new_path" = x; then 2.359 # It's still not found. Now this is an unrecoverable error. 2.360 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 2.361 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} 2.362 - has_space=`$ECHO "$complete" | $GREP " "` 2.363 - if test "x$has_space" != x; then 2.364 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.365 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.366 - fi 2.367 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 2.368 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 2.369 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;} 2.370 + has_space=`$ECHO "$complete" | $GREP " "` 2.371 + if test "x$has_space" != x; then 2.372 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.373 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.374 + fi 2.375 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 2.376 fi 2.377 fi 2.378 2.379 @@ -25925,11 +25921,11 @@ 2.380 elif test -f "${new_path}.cmd"; then 2.381 input_to_shortpath="${new_path}.cmd" 2.382 else 2.383 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5 2.384 -$as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;} 2.385 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5 2.386 +$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;} 2.387 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5 2.388 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;} 2.389 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 2.390 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 2.391 fi 2.392 else 2.393 input_to_shortpath="$new_path" 2.394 @@ -25976,7 +25972,7 @@ 2.395 2.396 # First separate the path from the arguments. This will split at the first 2.397 # space. 2.398 - complete="$MCS" 2.399 + complete="$STRIP" 2.400 path="${complete%% *}" 2.401 tmp="$complete EOL" 2.402 arguments="${tmp#* }" 2.403 @@ -26021,14 +26017,14 @@ 2.404 2.405 if test "x$new_path" = x; then 2.406 # It's still not found. Now this is an unrecoverable error. 2.407 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 2.408 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} 2.409 - has_space=`$ECHO "$complete" | $GREP " "` 2.410 - if test "x$has_space" != x; then 2.411 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.412 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.413 - fi 2.414 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 2.415 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 2.416 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;} 2.417 + has_space=`$ECHO "$complete" | $GREP " "` 2.418 + if test "x$has_space" != x; then 2.419 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.420 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.421 + fi 2.422 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 2.423 fi 2.424 fi 2.425 2.426 @@ -26074,7 +26070,7 @@ 2.427 # We're on a posix platform. Hooray! :) 2.428 # First separate the path from the arguments. This will split at the first 2.429 # space. 2.430 - complete="$MCS" 2.431 + complete="$STRIP" 2.432 path="${complete%% *}" 2.433 tmp="$complete EOL" 2.434 arguments="${tmp#* }" 2.435 @@ -26093,20 +26089,20 @@ 2.436 done 2.437 IFS="$IFS_save" 2.438 else 2.439 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) failed, using $path directly." >&5 2.440 -$as_echo "$as_me: Resolving MCS (as $path) failed, using $path directly." >&6;} 2.441 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5 2.442 +$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;} 2.443 new_path="$path" 2.444 fi 2.445 2.446 if test "x$new_path" = x; then 2.447 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 2.448 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} 2.449 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 2.450 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;} 2.451 has_space=`$ECHO "$complete" | $GREP " "` 2.452 if test "x$has_space" != x; then 2.453 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 2.454 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} 2.455 fi 2.456 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 2.457 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 2.458 fi 2.459 fi 2.460 2.461 @@ -26118,110 +26114,57 @@ 2.462 fi 2.463 2.464 if test "x$complete" != "x$new_complete"; then 2.465 - MCS="$new_complete" 2.466 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5 2.467 -$as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;} 2.468 - fi 2.469 - 2.470 -elif test "x$OPENJDK_TARGET_OS" != xwindows; then 2.471 - if test -n "$ac_tool_prefix"; then 2.472 - # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. 2.473 -set dummy ${ac_tool_prefix}nm; ac_word=$2 2.474 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.475 -$as_echo_n "checking for $ac_word... " >&6; } 2.476 -if test "${ac_cv_prog_NM+set}" = set; then : 2.477 - $as_echo_n "(cached) " >&6 2.478 -else 2.479 - if test -n "$NM"; then 2.480 - ac_cv_prog_NM="$NM" # Let the user override the test. 2.481 -else 2.482 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.483 -for as_dir in $PATH 2.484 -do 2.485 - IFS=$as_save_IFS 2.486 - test -z "$as_dir" && as_dir=. 2.487 - for ac_exec_ext in '' $ac_executable_extensions; do 2.488 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.489 - ac_cv_prog_NM="${ac_tool_prefix}nm" 2.490 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.491 - break 2 2.492 - fi 2.493 -done 2.494 - done 2.495 -IFS=$as_save_IFS 2.496 - 2.497 -fi 2.498 -fi 2.499 -NM=$ac_cv_prog_NM 2.500 -if test -n "$NM"; then 2.501 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 2.502 -$as_echo "$NM" >&6; } 2.503 -else 2.504 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.505 -$as_echo "no" >&6; } 2.506 -fi 2.507 - 2.508 - 2.509 -fi 2.510 -if test -z "$ac_cv_prog_NM"; then 2.511 - ac_ct_NM=$NM 2.512 - # Extract the first word of "nm", so it can be a program name with args. 2.513 -set dummy nm; ac_word=$2 2.514 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.515 -$as_echo_n "checking for $ac_word... " >&6; } 2.516 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 2.517 - $as_echo_n "(cached) " >&6 2.518 -else 2.519 - if test -n "$ac_ct_NM"; then 2.520 - ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test. 2.521 -else 2.522 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.523 -for as_dir in $PATH 2.524 -do 2.525 - IFS=$as_save_IFS 2.526 - test -z "$as_dir" && as_dir=. 2.527 - for ac_exec_ext in '' $ac_executable_extensions; do 2.528 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.529 - ac_cv_prog_ac_ct_NM="nm" 2.530 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.531 - break 2 2.532 - fi 2.533 -done 2.534 - done 2.535 -IFS=$as_save_IFS 2.536 - 2.537 -fi 2.538 -fi 2.539 -ac_ct_NM=$ac_cv_prog_ac_ct_NM 2.540 -if test -n "$ac_ct_NM"; then 2.541 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 2.542 -$as_echo "$ac_ct_NM" >&6; } 2.543 -else 2.544 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.545 -$as_echo "no" >&6; } 2.546 -fi 2.547 - 2.548 - if test "x$ac_ct_NM" = x; then 2.549 - NM="" 2.550 - else 2.551 - case $cross_compiling:$ac_tool_warned in 2.552 -yes:) 2.553 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2.554 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2.555 -ac_tool_warned=yes ;; 2.556 -esac 2.557 - NM=$ac_ct_NM 2.558 - fi 2.559 -else 2.560 - NM="$ac_cv_prog_NM" 2.561 -fi 2.562 - 2.563 - 2.564 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.565 - 2.566 - # First separate the path from the arguments. This will split at the first 2.567 - # space. 2.568 - complete="$NM" 2.569 + STRIP="$new_complete" 2.570 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5 2.571 +$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;} 2.572 + fi 2.573 + 2.574 + # Extract the first word of "mcs", so it can be a program name with args. 2.575 +set dummy mcs; ac_word=$2 2.576 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.577 +$as_echo_n "checking for $ac_word... " >&6; } 2.578 +if test "${ac_cv_path_MCS+set}" = set; then : 2.579 + $as_echo_n "(cached) " >&6 2.580 +else 2.581 + case $MCS in 2.582 + [\\/]* | ?:[\\/]*) 2.583 + ac_cv_path_MCS="$MCS" # Let the user override the test with a path. 2.584 + ;; 2.585 + *) 2.586 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.587 +for as_dir in $PATH 2.588 +do 2.589 + IFS=$as_save_IFS 2.590 + test -z "$as_dir" && as_dir=. 2.591 + for ac_exec_ext in '' $ac_executable_extensions; do 2.592 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.593 + ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext" 2.594 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.595 + break 2 2.596 + fi 2.597 +done 2.598 + done 2.599 +IFS=$as_save_IFS 2.600 + 2.601 + ;; 2.602 +esac 2.603 +fi 2.604 +MCS=$ac_cv_path_MCS 2.605 +if test -n "$MCS"; then 2.606 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5 2.607 +$as_echo "$MCS" >&6; } 2.608 +else 2.609 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.610 +$as_echo "no" >&6; } 2.611 +fi 2.612 + 2.613 + 2.614 + 2.615 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.616 + 2.617 + # First separate the path from the arguments. This will split at the first 2.618 + # space. 2.619 + complete="$MCS" 2.620 path="${complete%% *}" 2.621 tmp="$complete EOL" 2.622 arguments="${tmp#* }" 2.623 @@ -26257,14 +26200,14 @@ 2.624 fi 2.625 if test "x$new_path" = x; then 2.626 # It's still not found. Now this is an unrecoverable error. 2.627 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5 2.628 -$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;} 2.629 - has_space=`$ECHO "$complete" | $GREP " "` 2.630 - if test "x$has_space" != x; then 2.631 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.632 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.633 - fi 2.634 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5 2.635 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 2.636 +$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} 2.637 + has_space=`$ECHO "$complete" | $GREP " "` 2.638 + if test "x$has_space" != x; then 2.639 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.640 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.641 + fi 2.642 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 2.643 fi 2.644 fi 2.645 2.646 @@ -26284,11 +26227,11 @@ 2.647 elif test -f "${new_path}.cmd"; then 2.648 input_to_shortpath="${new_path}.cmd" 2.649 else 2.650 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5 2.651 -$as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;} 2.652 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5 2.653 +$as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;} 2.654 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5 2.655 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;} 2.656 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5 2.657 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 2.658 fi 2.659 else 2.660 input_to_shortpath="$new_path" 2.661 @@ -26335,7 +26278,7 @@ 2.662 2.663 # First separate the path from the arguments. This will split at the first 2.664 # space. 2.665 - complete="$NM" 2.666 + complete="$MCS" 2.667 path="${complete%% *}" 2.668 tmp="$complete EOL" 2.669 arguments="${tmp#* }" 2.670 @@ -26380,14 +26323,14 @@ 2.671 2.672 if test "x$new_path" = x; then 2.673 # It's still not found. Now this is an unrecoverable error. 2.674 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5 2.675 -$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;} 2.676 - has_space=`$ECHO "$complete" | $GREP " "` 2.677 - if test "x$has_space" != x; then 2.678 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.679 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.680 - fi 2.681 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5 2.682 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 2.683 +$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} 2.684 + has_space=`$ECHO "$complete" | $GREP " "` 2.685 + if test "x$has_space" != x; then 2.686 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.687 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.688 + fi 2.689 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 2.690 fi 2.691 fi 2.692 2.693 @@ -26433,7 +26376,7 @@ 2.694 # We're on a posix platform. Hooray! :) 2.695 # First separate the path from the arguments. This will split at the first 2.696 # space. 2.697 - complete="$NM" 2.698 + complete="$MCS" 2.699 path="${complete%% *}" 2.700 tmp="$complete EOL" 2.701 arguments="${tmp#* }" 2.702 @@ -26452,6 +26395,365 @@ 2.703 done 2.704 IFS="$IFS_save" 2.705 else 2.706 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) failed, using $path directly." >&5 2.707 +$as_echo "$as_me: Resolving MCS (as $path) failed, using $path directly." >&6;} 2.708 + new_path="$path" 2.709 + fi 2.710 + 2.711 + if test "x$new_path" = x; then 2.712 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 2.713 +$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} 2.714 + has_space=`$ECHO "$complete" | $GREP " "` 2.715 + if test "x$has_space" != x; then 2.716 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 2.717 +$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} 2.718 + fi 2.719 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 2.720 + fi 2.721 + fi 2.722 + 2.723 + # Now join together the path and the arguments once again 2.724 + if test "x$arguments" != xEOL; then 2.725 + new_complete="$new_path ${arguments% *}" 2.726 + else 2.727 + new_complete="$new_path" 2.728 + fi 2.729 + 2.730 + if test "x$complete" != "x$new_complete"; then 2.731 + MCS="$new_complete" 2.732 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5 2.733 +$as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;} 2.734 + fi 2.735 + 2.736 +elif test "x$OPENJDK_TARGET_OS" != xwindows; then 2.737 + if test -n "$ac_tool_prefix"; then 2.738 + # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. 2.739 +set dummy ${ac_tool_prefix}nm; ac_word=$2 2.740 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.741 +$as_echo_n "checking for $ac_word... " >&6; } 2.742 +if test "${ac_cv_prog_NM+set}" = set; then : 2.743 + $as_echo_n "(cached) " >&6 2.744 +else 2.745 + if test -n "$NM"; then 2.746 + ac_cv_prog_NM="$NM" # Let the user override the test. 2.747 +else 2.748 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.749 +for as_dir in $PATH 2.750 +do 2.751 + IFS=$as_save_IFS 2.752 + test -z "$as_dir" && as_dir=. 2.753 + for ac_exec_ext in '' $ac_executable_extensions; do 2.754 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.755 + ac_cv_prog_NM="${ac_tool_prefix}nm" 2.756 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.757 + break 2 2.758 + fi 2.759 +done 2.760 + done 2.761 +IFS=$as_save_IFS 2.762 + 2.763 +fi 2.764 +fi 2.765 +NM=$ac_cv_prog_NM 2.766 +if test -n "$NM"; then 2.767 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 2.768 +$as_echo "$NM" >&6; } 2.769 +else 2.770 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.771 +$as_echo "no" >&6; } 2.772 +fi 2.773 + 2.774 + 2.775 +fi 2.776 +if test -z "$ac_cv_prog_NM"; then 2.777 + ac_ct_NM=$NM 2.778 + # Extract the first word of "nm", so it can be a program name with args. 2.779 +set dummy nm; ac_word=$2 2.780 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.781 +$as_echo_n "checking for $ac_word... " >&6; } 2.782 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 2.783 + $as_echo_n "(cached) " >&6 2.784 +else 2.785 + if test -n "$ac_ct_NM"; then 2.786 + ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test. 2.787 +else 2.788 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.789 +for as_dir in $PATH 2.790 +do 2.791 + IFS=$as_save_IFS 2.792 + test -z "$as_dir" && as_dir=. 2.793 + for ac_exec_ext in '' $ac_executable_extensions; do 2.794 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2.795 + ac_cv_prog_ac_ct_NM="nm" 2.796 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2.797 + break 2 2.798 + fi 2.799 +done 2.800 + done 2.801 +IFS=$as_save_IFS 2.802 + 2.803 +fi 2.804 +fi 2.805 +ac_ct_NM=$ac_cv_prog_ac_ct_NM 2.806 +if test -n "$ac_ct_NM"; then 2.807 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 2.808 +$as_echo "$ac_ct_NM" >&6; } 2.809 +else 2.810 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.811 +$as_echo "no" >&6; } 2.812 +fi 2.813 + 2.814 + if test "x$ac_ct_NM" = x; then 2.815 + NM="" 2.816 + else 2.817 + case $cross_compiling:$ac_tool_warned in 2.818 +yes:) 2.819 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2.820 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2.821 +ac_tool_warned=yes ;; 2.822 +esac 2.823 + NM=$ac_ct_NM 2.824 + fi 2.825 +else 2.826 + NM="$ac_cv_prog_NM" 2.827 +fi 2.828 + 2.829 + 2.830 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.831 + 2.832 + # First separate the path from the arguments. This will split at the first 2.833 + # space. 2.834 + complete="$NM" 2.835 + path="${complete%% *}" 2.836 + tmp="$complete EOL" 2.837 + arguments="${tmp#* }" 2.838 + 2.839 + # Input might be given as Windows format, start by converting to 2.840 + # unix format. 2.841 + new_path=`$CYGPATH -u "$path"` 2.842 + 2.843 + # Now try to locate executable using which 2.844 + new_path=`$WHICH "$new_path" 2> /dev/null` 2.845 + # bat and cmd files are not always considered executable in cygwin causing which 2.846 + # to not find them 2.847 + if test "x$new_path" = x \ 2.848 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 2.849 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 2.850 + new_path=`$CYGPATH -u "$path"` 2.851 + fi 2.852 + if test "x$new_path" = x; then 2.853 + # Oops. Which didn't find the executable. 2.854 + # The splitting of arguments from the executable at a space might have been incorrect, 2.855 + # since paths with space are more likely in Windows. Give it another try with the whole 2.856 + # argument. 2.857 + path="$complete" 2.858 + arguments="EOL" 2.859 + new_path=`$CYGPATH -u "$path"` 2.860 + new_path=`$WHICH "$new_path" 2> /dev/null` 2.861 + # bat and cmd files are not always considered executable in cygwin causing which 2.862 + # to not find them 2.863 + if test "x$new_path" = x \ 2.864 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 2.865 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 2.866 + new_path=`$CYGPATH -u "$path"` 2.867 + fi 2.868 + if test "x$new_path" = x; then 2.869 + # It's still not found. Now this is an unrecoverable error. 2.870 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5 2.871 +$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;} 2.872 + has_space=`$ECHO "$complete" | $GREP " "` 2.873 + if test "x$has_space" != x; then 2.874 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.875 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.876 + fi 2.877 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5 2.878 + fi 2.879 + fi 2.880 + 2.881 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 2.882 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 2.883 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 2.884 + # "foo.exe" is OK but "foo" is an error. 2.885 + # 2.886 + # This test is therefore slightly more accurate than "test -f" to check for file precense. 2.887 + # It is also a way to make sure we got the proper file name for the real test later on. 2.888 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 2.889 + if test "x$test_shortpath" = x; then 2.890 + # Short path failed, file does not exist as specified. 2.891 + # Try adding .exe or .cmd 2.892 + if test -f "${new_path}.exe"; then 2.893 + input_to_shortpath="${new_path}.exe" 2.894 + elif test -f "${new_path}.cmd"; then 2.895 + input_to_shortpath="${new_path}.cmd" 2.896 + else 2.897 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5 2.898 +$as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;} 2.899 + { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5 2.900 +$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;} 2.901 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5 2.902 + fi 2.903 + else 2.904 + input_to_shortpath="$new_path" 2.905 + fi 2.906 + 2.907 + # Call helper function which possibly converts this using DOS-style short mode. 2.908 + # If so, the updated path is stored in $new_path. 2.909 + new_path="$input_to_shortpath" 2.910 + 2.911 + input_path="$input_to_shortpath" 2.912 + # Check if we need to convert this using DOS-style short mode. If the path 2.913 + # contains just simple characters, use it. Otherwise (spaces, weird characters), 2.914 + # take no chances and rewrite it. 2.915 + # Note: m4 eats our [], so we need to use [ and ] instead. 2.916 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 2.917 + if test "x$has_forbidden_chars" != x; then 2.918 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 2.919 + shortmode_path=`$CYGPATH -s -m -a "$input_path"` 2.920 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 2.921 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 2.922 + # Going to short mode and back again did indeed matter. Since short mode is 2.923 + # case insensitive, let's make it lowercase to improve readability. 2.924 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 2.925 + # Now convert it back to Unix-stile (cygpath) 2.926 + input_path=`$CYGPATH -u "$shortmode_path"` 2.927 + new_path="$input_path" 2.928 + fi 2.929 + fi 2.930 + 2.931 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 2.932 + if test "x$test_cygdrive_prefix" = x; then 2.933 + # As a simple fix, exclude /usr/bin since it's not a real path. 2.934 + if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then 2.935 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to 2.936 + # a path prefixed by /cygdrive for fixpath to work. 2.937 + new_path="$CYGWIN_ROOT_PATH$input_path" 2.938 + fi 2.939 + fi 2.940 + 2.941 + # remove trailing .exe if any 2.942 + new_path="${new_path/%.exe/}" 2.943 + 2.944 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 2.945 + 2.946 + # First separate the path from the arguments. This will split at the first 2.947 + # space. 2.948 + complete="$NM" 2.949 + path="${complete%% *}" 2.950 + tmp="$complete EOL" 2.951 + arguments="${tmp#* }" 2.952 + 2.953 + # Input might be given as Windows format, start by converting to 2.954 + # unix format. 2.955 + new_path="$path" 2.956 + 2.957 + windows_path="$new_path" 2.958 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.959 + unix_path=`$CYGPATH -u "$windows_path"` 2.960 + new_path="$unix_path" 2.961 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 2.962 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 2.963 + new_path="$unix_path" 2.964 + fi 2.965 + 2.966 + 2.967 + # Now try to locate executable using which 2.968 + new_path=`$WHICH "$new_path" 2> /dev/null` 2.969 + 2.970 + if test "x$new_path" = x; then 2.971 + # Oops. Which didn't find the executable. 2.972 + # The splitting of arguments from the executable at a space might have been incorrect, 2.973 + # since paths with space are more likely in Windows. Give it another try with the whole 2.974 + # argument. 2.975 + path="$complete" 2.976 + arguments="EOL" 2.977 + new_path="$path" 2.978 + 2.979 + windows_path="$new_path" 2.980 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.981 + unix_path=`$CYGPATH -u "$windows_path"` 2.982 + new_path="$unix_path" 2.983 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 2.984 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 2.985 + new_path="$unix_path" 2.986 + fi 2.987 + 2.988 + 2.989 + new_path=`$WHICH "$new_path" 2> /dev/null` 2.990 + 2.991 + if test "x$new_path" = x; then 2.992 + # It's still not found. Now this is an unrecoverable error. 2.993 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5 2.994 +$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;} 2.995 + has_space=`$ECHO "$complete" | $GREP " "` 2.996 + if test "x$has_space" != x; then 2.997 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 2.998 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} 2.999 + fi 2.1000 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5 2.1001 + fi 2.1002 + fi 2.1003 + 2.1004 + # Now new_path has a complete unix path to the binary 2.1005 + if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then 2.1006 + # Keep paths in /bin as-is, but remove trailing .exe if any 2.1007 + new_path="${new_path/%.exe/}" 2.1008 + # Do not save /bin paths to all_fixpath_prefixes! 2.1009 + else 2.1010 + # Not in mixed or Windows style, start by that. 2.1011 + new_path=`cmd //c echo $new_path` 2.1012 + 2.1013 + input_path="$new_path" 2.1014 + # Check if we need to convert this using DOS-style short mode. If the path 2.1015 + # contains just simple characters, use it. Otherwise (spaces, weird characters), 2.1016 + # take no chances and rewrite it. 2.1017 + # Note: m4 eats our [], so we need to use [ and ] instead. 2.1018 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 2.1019 + if test "x$has_forbidden_chars" != x; then 2.1020 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 2.1021 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 2.1022 + fi 2.1023 + 2.1024 + # Output is in $new_path 2.1025 + 2.1026 + windows_path="$new_path" 2.1027 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.1028 + unix_path=`$CYGPATH -u "$windows_path"` 2.1029 + new_path="$unix_path" 2.1030 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 2.1031 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 2.1032 + new_path="$unix_path" 2.1033 + fi 2.1034 + 2.1035 + # remove trailing .exe if any 2.1036 + new_path="${new_path/%.exe/}" 2.1037 + 2.1038 + # Save the first 10 bytes of this path to the storage, so fixpath can work. 2.1039 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 2.1040 + fi 2.1041 + 2.1042 + else 2.1043 + # We're on a posix platform. Hooray! :) 2.1044 + # First separate the path from the arguments. This will split at the first 2.1045 + # space. 2.1046 + complete="$NM" 2.1047 + path="${complete%% *}" 2.1048 + tmp="$complete EOL" 2.1049 + arguments="${tmp#* }" 2.1050 + 2.1051 + # Cannot rely on the command "which" here since it doesn't always work. 2.1052 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 2.1053 + if test -z "$is_absolute_path"; then 2.1054 + # Path to executable is not absolute. Find it. 2.1055 + IFS_save="$IFS" 2.1056 + IFS=: 2.1057 + for p in $PATH; do 2.1058 + if test -f "$p/$path" && test -x "$p/$path"; then 2.1059 + new_path="$p/$path" 2.1060 + break 2.1061 + fi 2.1062 + done 2.1063 + IFS="$IFS_save" 2.1064 + else 2.1065 { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5 2.1066 $as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;} 2.1067 new_path="$path" 2.1068 @@ -26482,6 +26784,8 @@ 2.1069 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;} 2.1070 fi 2.1071 2.1072 + GNM="$NM" 2.1073 + 2.1074 if test -n "$ac_tool_prefix"; then 2.1075 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 2.1076 set dummy ${ac_tool_prefix}strip; ac_word=$2 2.1077 @@ -31835,7 +32139,7 @@ 2.1078 See the pkg-config man page for more details. 2.1079 2.1080 To get pkg-config, see <http://pkg-config.freedesktop.org/>. 2.1081 -See \`config.log' for more details" "$LINENO" 5; } 2.1082 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1083 else 2.1084 LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS 2.1085 LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS 2.1086 @@ -31851,7 +32155,7 @@ 2.1087 set dummy llvm-config; ac_word=$2 2.1088 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1089 $as_echo_n "checking for $ac_word... " >&6; } 2.1090 -if ${ac_cv_prog_LLVM_CONFIG+:} false; then : 2.1091 +if test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then : 2.1092 $as_echo_n "(cached) " >&6 2.1093 else 2.1094 if test -n "$LLVM_CONFIG"; then
3.1 --- a/common/autoconf/spec.gmk.in Mon Apr 08 14:07:32 2013 -0400 3.2 +++ b/common/autoconf/spec.gmk.in Tue Apr 09 09:42:20 2013 +0200 3.3 @@ -377,6 +377,7 @@ 3.4 ARFLAGS:=@ARFLAGS@ 3.5 3.6 NM:=@NM@ 3.7 +GNM:=@GNM@ 3.8 STRIP:=@STRIP@ 3.9 MCS:=@MCS@ 3.10
4.1 --- a/common/autoconf/toolchain.m4 Mon Apr 08 14:07:32 2013 -0400 4.2 +++ b/common/autoconf/toolchain.m4 Tue Apr 09 09:42:20 2013 +0200 4.3 @@ -441,8 +441,10 @@ 4.4 AC_SUBST(AS) 4.5 4.6 if test "x$OPENJDK_TARGET_OS" = xsolaris; then 4.7 - AC_PATH_PROGS(NM, [gnm nm]) 4.8 + AC_PATH_PROG(NM, nm) 4.9 BASIC_FIXUP_EXECUTABLE(NM) 4.10 + AC_PATH_PROG(GNM, gnm) 4.11 + BASIC_FIXUP_EXECUTABLE(GNM) 4.12 AC_PATH_PROG(STRIP, strip) 4.13 BASIC_FIXUP_EXECUTABLE(STRIP) 4.14 AC_PATH_PROG(MCS, mcs) 4.15 @@ -450,6 +452,8 @@ 4.16 elif test "x$OPENJDK_TARGET_OS" != xwindows; then 4.17 AC_CHECK_TOOL(NM, nm) 4.18 BASIC_FIXUP_EXECUTABLE(NM) 4.19 + GNM="$NM" 4.20 + AC_SUBST(GNM) 4.21 AC_CHECK_TOOL(STRIP, strip) 4.22 BASIC_FIXUP_EXECUTABLE(STRIP) 4.23 fi
