Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Tue, 17 Sep 2013 19:06:17 -0700
- author
- katleman
- date
- Tue, 17 Sep 2013 19:06:17 -0700
- changeset 800
- 59d6af7422af
- parent 793
- 4bf059350c51
- parent 799
- aab351790498
- child 801
- 7697621037fd
Merge
1.1 --- a/Makefile Tue Sep 17 08:08:01 2013 -0700 1.2 +++ b/Makefile Tue Sep 17 19:06:17 2013 -0700 1.3 @@ -404,7 +404,6 @@ 1.4 CACERTS_FILE.desc = Location of certificates file 1.5 DEVTOOLS_PATH.desc = Directory containing zip and gnumake 1.6 CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files 1.7 -DXSDK_PATH.desc = Root directory of DirectX SDK 1.8 1.9 # Make variables to print out (description and value) 1.10 VARIABLE_PRINTVAL_LIST += \ 1.11 @@ -429,17 +428,6 @@ 1.12 VARIABLE_CHECKFIL_LIST += \ 1.13 CACERTS_FILE 1.14 1.15 -# Some are windows specific 1.16 -ifeq ($(PLATFORM), windows) 1.17 - 1.18 -VARIABLE_PRINTVAL_LIST += \ 1.19 - DXSDK_PATH 1.20 - 1.21 -VARIABLE_CHECKDIR_LIST += \ 1.22 - DXSDK_PATH 1.23 - 1.24 -endif 1.25 - 1.26 # For pattern rules below, so all are treated the same 1.27 DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval) 1.28 DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
2.1 --- a/README-builds.html Tue Sep 17 08:08:01 2013 -0700 2.2 +++ b/README-builds.html Tue Sep 17 19:06:17 2013 -0700 2.3 @@ -444,10 +444,6 @@ 2.4 Install 2.5 <a href="#vs2010">Visual Studio 2010</a> 2.6 </li> 2.7 - <li> 2.8 - Install the 2.9 - <a href="#dxsdk">Microsoft DirectX SDK</a> 2.10 - </li> 2.11 </ul> 2.12 </td> 2.13 <td> 2.14 @@ -972,25 +968,6 @@ 2.15 </td> 2.16 </tr> 2.17 <tr> 2.18 - <td><b><code>--with-dxsdk=</code></b><i>path</i></td> 2.19 - <td> 2.20 - select location of the Windows Direct X SDK install 2.21 - <br> 2.22 - The <a name="dxsdk">Microsoft DirectX 9.0 SDK</a> 2.23 - header files and libraries 2.24 - from the Summer 2004 edition 2.25 - are required for building OpenJDK. 2.26 - This SDK can be downloaded from 2.27 - <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=FD044A42-9912-42A3-9A9E-D857199F888E&displaylang=en" target="_blank"> 2.28 - Microsoft DirectX 9.0 SDK (Summer 2004)</a>. 2.29 - If the link above becomes obsolete, the SDK can be found from 2.30 - <a href="http://download.microsoft.com" target="_blank">the Microsoft Download Site</a> 2.31 - (search with "DirectX 9.0 SDK Update Summer 2004"). 2.32 - Installation usually will set the environment variable 2.33 - <code>DXSDK_DIR</code> to it's install location. 2.34 - </td> 2.35 - </tr> 2.36 - <tr> 2.37 <td><b><code>--with-freetype=</code></b><i>path</i></td> 2.38 <td> 2.39 select the freetype files to use.
3.1 --- a/common/autoconf/build-aux/autoconf-config.guess Tue Sep 17 08:08:01 2013 -0700 3.2 +++ b/common/autoconf/build-aux/autoconf-config.guess Tue Sep 17 19:06:17 2013 -0700 3.3 @@ -26,10 +26,10 @@ 3.4 3.5 # Attempt to guess a canonical system name. 3.6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3.7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 3.8 -# Free Software Foundation, Inc. 3.9 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 3.10 +# 2011, 2012 Free Software Foundation, Inc. 3.11 3.12 -timestamp='2008-01-23' 3.13 +timestamp='2012-02-10' 3.14 3.15 # This file is free software; you can redistribute it and/or modify it 3.16 # under the terms of the GNU General Public License as published by 3.17 @@ -42,9 +42,7 @@ 3.18 # General Public License for more details. 3.19 # 3.20 # You should have received a copy of the GNU General Public License 3.21 -# along with this program; if not, write to the Free Software 3.22 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 3.23 -# 02110-1301, USA. 3.24 +# along with this program; if not, see <http://www.gnu.org/licenses/>. 3.25 # 3.26 # As a special exception to the GNU General Public License, if you 3.27 # distribute this file as part of a program that contains a 3.28 @@ -52,16 +50,16 @@ 3.29 # the same distribution terms that you use for the rest of that program. 3.30 3.31 3.32 -# Originally written by Per Bothner <per@bothner.com>. 3.33 -# Please send patches to <config-patches@gnu.org>. Submit a context 3.34 -# diff and a properly formatted ChangeLog entry. 3.35 +# Originally written by Per Bothner. Please send patches (context 3.36 +# diff format) to <config-patches@gnu.org> and include a ChangeLog 3.37 +# entry. 3.38 # 3.39 # This script attempts to guess a canonical system name similar to 3.40 # config.sub. If it succeeds, it prints the system name on stdout, and 3.41 # exits with 0. Otherwise, it exits with 1. 3.42 # 3.43 -# The plan is that this can be called by configure scripts if you 3.44 -# don't specify an explicit build system type. 3.45 +# You can get the latest version of this script from: 3.46 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 3.47 3.48 me=`echo "$0" | sed -e 's,.*/,,'` 3.49 3.50 @@ -81,8 +79,9 @@ 3.51 GNU config.guess ($timestamp) 3.52 3.53 Originally written by Per Bothner. 3.54 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 3.55 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 3.56 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 3.57 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 3.58 +Free Software Foundation, Inc. 3.59 3.60 This is free software; see the source for copying conditions. There is NO 3.61 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 3.62 @@ -169,7 +168,7 @@ 3.63 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in 3.64 *:NetBSD:*:*) 3.65 # NetBSD (nbsd) targets should (where applicable) match one or 3.66 - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, 3.67 + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, 3.68 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently 3.69 # switched to ELF, *-*-netbsd* would select the old 3.70 # object file format. This provides both forward 3.71 @@ -195,7 +194,7 @@ 3.72 arm*|i386|m68k|ns32k|sh3*|sparc|vax) 3.73 eval $set_cc_for_build 3.74 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ 3.75 - | grep __ELF__ >/dev/null 3.76 + | grep -q __ELF__ 3.77 then 3.78 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). 3.79 # Return netbsd for either. FIX? 3.80 @@ -205,7 +204,7 @@ 3.81 fi 3.82 ;; 3.83 *) 3.84 - os=netbsd 3.85 + os=netbsd 3.86 ;; 3.87 esac 3.88 # The OS release 3.89 @@ -248,7 +247,7 @@ 3.90 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` 3.91 ;; 3.92 *5.*) 3.93 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 3.94 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 3.95 ;; 3.96 esac 3.97 # According to Compaq, /usr/sbin/psrinfo has been available on 3.98 @@ -294,7 +293,10 @@ 3.99 # A Xn.n version is an unreleased experimental baselevel. 3.100 # 1.2 uses "1.2" for uname -r. 3.101 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.102 - exit ;; 3.103 + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. 3.104 + exitcode=$? 3.105 + trap '' 0 3.106 + exit $exitcode ;; 3.107 Alpha\ *:Windows_NT*:*) 3.108 # How do we know it's Interix rather than the generic POSIX subsystem? 3.109 # Should we change UNAME_MACHINE based on the output of uname instead 3.110 @@ -320,7 +322,7 @@ 3.111 echo s390-ibm-zvmoe 3.112 exit ;; 3.113 *:OS400:*:*) 3.114 - echo powerpc-ibm-os400 3.115 + echo powerpc-ibm-os400 3.116 exit ;; 3.117 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 3.118 echo arm-acorn-riscix${UNAME_RELEASE} 3.119 @@ -349,14 +351,33 @@ 3.120 case `/usr/bin/uname -p` in 3.121 sparc) echo sparc-icl-nx7; exit ;; 3.122 esac ;; 3.123 + s390x:SunOS:*:*) 3.124 + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 3.125 + exit ;; 3.126 sun4H:SunOS:5.*:*) 3.127 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 3.128 exit ;; 3.129 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 3.130 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 3.131 exit ;; 3.132 + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) 3.133 + echo i386-pc-auroraux${UNAME_RELEASE} 3.134 + exit ;; 3.135 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 3.136 - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 3.137 + eval $set_cc_for_build 3.138 + SUN_ARCH="i386" 3.139 + # If there is a compiler, see if it is configured for 64-bit objects. 3.140 + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. 3.141 + # This test works for both compilers. 3.142 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 3.143 + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ 3.144 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 3.145 + grep IS_64BIT_ARCH >/dev/null 3.146 + then 3.147 + SUN_ARCH="x86_64" 3.148 + fi 3.149 + fi 3.150 + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 3.151 exit ;; 3.152 sun4*:SunOS:6*:*) 3.153 # According to config.sub, this is the proper way to canonicalize 3.154 @@ -400,23 +421,23 @@ 3.155 # MiNT. But MiNT is downward compatible to TOS, so this should 3.156 # be no problem. 3.157 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 3.158 - echo m68k-atari-mint${UNAME_RELEASE} 3.159 + echo m68k-atari-mint${UNAME_RELEASE} 3.160 exit ;; 3.161 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 3.162 echo m68k-atari-mint${UNAME_RELEASE} 3.163 - exit ;; 3.164 + exit ;; 3.165 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 3.166 - echo m68k-atari-mint${UNAME_RELEASE} 3.167 + echo m68k-atari-mint${UNAME_RELEASE} 3.168 exit ;; 3.169 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 3.170 - echo m68k-milan-mint${UNAME_RELEASE} 3.171 - exit ;; 3.172 + echo m68k-milan-mint${UNAME_RELEASE} 3.173 + exit ;; 3.174 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 3.175 - echo m68k-hades-mint${UNAME_RELEASE} 3.176 - exit ;; 3.177 + echo m68k-hades-mint${UNAME_RELEASE} 3.178 + exit ;; 3.179 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 3.180 - echo m68k-unknown-mint${UNAME_RELEASE} 3.181 - exit ;; 3.182 + echo m68k-unknown-mint${UNAME_RELEASE} 3.183 + exit ;; 3.184 m68k:machten:*:*) 3.185 echo m68k-apple-machten${UNAME_RELEASE} 3.186 exit ;; 3.187 @@ -486,8 +507,8 @@ 3.188 echo m88k-motorola-sysv3 3.189 exit ;; 3.190 AViiON:dgux:*:*) 3.191 - # DG/UX returns AViiON for all architectures 3.192 - UNAME_PROCESSOR=`/usr/bin/uname -p` 3.193 + # DG/UX returns AViiON for all architectures 3.194 + UNAME_PROCESSOR=`/usr/bin/uname -p` 3.195 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] 3.196 then 3.197 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ 3.198 @@ -500,7 +521,7 @@ 3.199 else 3.200 echo i586-dg-dgux${UNAME_RELEASE} 3.201 fi 3.202 - exit ;; 3.203 + exit ;; 3.204 M88*:DolphinOS:*:*) # DolphinOS (SVR3) 3.205 echo m88k-dolphin-sysv3 3.206 exit ;; 3.207 @@ -557,7 +578,7 @@ 3.208 echo rs6000-ibm-aix3.2 3.209 fi 3.210 exit ;; 3.211 - *:AIX:*:[456]) 3.212 + *:AIX:*:[4567]) 3.213 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 3.214 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 3.215 IBM_ARCH=rs6000 3.216 @@ -600,52 +621,52 @@ 3.217 9000/[678][0-9][0-9]) 3.218 if [ -x /usr/bin/getconf ]; then 3.219 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 3.220 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 3.221 - case "${sc_cpu_version}" in 3.222 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 3.223 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 3.224 - 532) # CPU_PA_RISC2_0 3.225 - case "${sc_kernel_bits}" in 3.226 - 32) HP_ARCH="hppa2.0n" ;; 3.227 - 64) HP_ARCH="hppa2.0w" ;; 3.228 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 3.229 + case "${sc_cpu_version}" in 3.230 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 3.231 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 3.232 + 532) # CPU_PA_RISC2_0 3.233 + case "${sc_kernel_bits}" in 3.234 + 32) HP_ARCH="hppa2.0n" ;; 3.235 + 64) HP_ARCH="hppa2.0w" ;; 3.236 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 3.237 - esac ;; 3.238 - esac 3.239 + esac ;; 3.240 + esac 3.241 fi 3.242 if [ "${HP_ARCH}" = "" ]; then 3.243 eval $set_cc_for_build 3.244 - sed 's/^ //' << EOF >$dummy.c 3.245 + sed 's/^ //' << EOF >$dummy.c 3.246 3.247 - #define _HPUX_SOURCE 3.248 - #include <stdlib.h> 3.249 - #include <unistd.h> 3.250 + #define _HPUX_SOURCE 3.251 + #include <stdlib.h> 3.252 + #include <unistd.h> 3.253 3.254 - int main () 3.255 - { 3.256 - #if defined(_SC_KERNEL_BITS) 3.257 - long bits = sysconf(_SC_KERNEL_BITS); 3.258 - #endif 3.259 - long cpu = sysconf (_SC_CPU_VERSION); 3.260 + int main () 3.261 + { 3.262 + #if defined(_SC_KERNEL_BITS) 3.263 + long bits = sysconf(_SC_KERNEL_BITS); 3.264 + #endif 3.265 + long cpu = sysconf (_SC_CPU_VERSION); 3.266 3.267 - switch (cpu) 3.268 - { 3.269 - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; 3.270 - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; 3.271 - case CPU_PA_RISC2_0: 3.272 - #if defined(_SC_KERNEL_BITS) 3.273 - switch (bits) 3.274 - { 3.275 - case 64: puts ("hppa2.0w"); break; 3.276 - case 32: puts ("hppa2.0n"); break; 3.277 - default: puts ("hppa2.0"); break; 3.278 - } break; 3.279 - #else /* !defined(_SC_KERNEL_BITS) */ 3.280 - puts ("hppa2.0"); break; 3.281 - #endif 3.282 - default: puts ("hppa1.0"); break; 3.283 - } 3.284 - exit (0); 3.285 - } 3.286 + switch (cpu) 3.287 + { 3.288 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; 3.289 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; 3.290 + case CPU_PA_RISC2_0: 3.291 + #if defined(_SC_KERNEL_BITS) 3.292 + switch (bits) 3.293 + { 3.294 + case 64: puts ("hppa2.0w"); break; 3.295 + case 32: puts ("hppa2.0n"); break; 3.296 + default: puts ("hppa2.0"); break; 3.297 + } break; 3.298 + #else /* !defined(_SC_KERNEL_BITS) */ 3.299 + puts ("hppa2.0"); break; 3.300 + #endif 3.301 + default: puts ("hppa1.0"); break; 3.302 + } 3.303 + exit (0); 3.304 + } 3.305 EOF 3.306 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` 3.307 test -z "$HP_ARCH" && HP_ARCH=hppa 3.308 @@ -665,7 +686,7 @@ 3.309 # => hppa64-hp-hpux11.23 3.310 3.311 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | 3.312 - grep __LP64__ >/dev/null 3.313 + grep -q __LP64__ 3.314 then 3.315 HP_ARCH="hppa2.0w" 3.316 else 3.317 @@ -736,22 +757,22 @@ 3.318 exit ;; 3.319 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) 3.320 echo c1-convex-bsd 3.321 - exit ;; 3.322 + exit ;; 3.323 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) 3.324 if getsysinfo -f scalar_acc 3.325 then echo c32-convex-bsd 3.326 else echo c2-convex-bsd 3.327 fi 3.328 - exit ;; 3.329 + exit ;; 3.330 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) 3.331 echo c34-convex-bsd 3.332 - exit ;; 3.333 + exit ;; 3.334 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) 3.335 echo c38-convex-bsd 3.336 - exit ;; 3.337 + exit ;; 3.338 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) 3.339 echo c4-convex-bsd 3.340 - exit ;; 3.341 + exit ;; 3.342 CRAY*Y-MP:*:*:*) 3.343 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 3.344 exit ;; 3.345 @@ -775,14 +796,14 @@ 3.346 exit ;; 3.347 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 3.348 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.349 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 3.350 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 3.351 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 3.352 - exit ;; 3.353 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 3.354 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 3.355 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 3.356 + exit ;; 3.357 5000:UNIX_System_V:4.*:*) 3.358 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 3.359 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 3.360 - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 3.361 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 3.362 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 3.363 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 3.364 exit ;; 3.365 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 3.366 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 3.367 @@ -794,13 +815,12 @@ 3.368 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 3.369 exit ;; 3.370 *:FreeBSD:*:*) 3.371 - case ${UNAME_MACHINE} in 3.372 - pc98) 3.373 - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 3.374 + UNAME_PROCESSOR=`/usr/bin/uname -p` 3.375 + case ${UNAME_PROCESSOR} in 3.376 amd64) 3.377 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 3.378 *) 3.379 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 3.380 + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 3.381 esac 3.382 exit ;; 3.383 i*:CYGWIN*:*) 3.384 @@ -809,19 +829,22 @@ 3.385 *:MINGW*:*) 3.386 echo ${UNAME_MACHINE}-pc-mingw32 3.387 exit ;; 3.388 + i*:MSYS*:*) 3.389 + echo ${UNAME_MACHINE}-pc-msys 3.390 + exit ;; 3.391 i*:windows32*:*) 3.392 - # uname -m includes "-pc" on this system. 3.393 - echo ${UNAME_MACHINE}-mingw32 3.394 + # uname -m includes "-pc" on this system. 3.395 + echo ${UNAME_MACHINE}-mingw32 3.396 exit ;; 3.397 i*:PW*:*) 3.398 echo ${UNAME_MACHINE}-pc-pw32 3.399 exit ;; 3.400 - *:Interix*:[3456]*) 3.401 - case ${UNAME_MACHINE} in 3.402 + *:Interix*:*) 3.403 + case ${UNAME_MACHINE} in 3.404 x86) 3.405 echo i586-pc-interix${UNAME_RELEASE} 3.406 exit ;; 3.407 - EM64T | authenticamd) 3.408 + authenticamd | genuineintel | EM64T) 3.409 echo x86_64-unknown-interix${UNAME_RELEASE} 3.410 exit ;; 3.411 IA64) 3.412 @@ -831,6 +854,9 @@ 3.413 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 3.414 echo i${UNAME_MACHINE}-pc-mks 3.415 exit ;; 3.416 + 8664:Windows_NT:*) 3.417 + echo x86_64-pc-mks 3.418 + exit ;; 3.419 i*:Windows_NT*:* | Pentium*:Windows_NT*:*) 3.420 # How do we know it's Interix rather than the generic POSIX subsystem? 3.421 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we 3.422 @@ -860,6 +886,27 @@ 3.423 i*86:Minix:*:*) 3.424 echo ${UNAME_MACHINE}-pc-minix 3.425 exit ;; 3.426 + aarch64:Linux:*:*) 3.427 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.428 + exit ;; 3.429 + aarch64_be:Linux:*:*) 3.430 + UNAME_MACHINE=aarch64_be 3.431 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.432 + exit ;; 3.433 + alpha:Linux:*:*) 3.434 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 3.435 + EV5) UNAME_MACHINE=alphaev5 ;; 3.436 + EV56) UNAME_MACHINE=alphaev56 ;; 3.437 + PCA56) UNAME_MACHINE=alphapca56 ;; 3.438 + PCA57) UNAME_MACHINE=alphapca56 ;; 3.439 + EV6) UNAME_MACHINE=alphaev6 ;; 3.440 + EV67) UNAME_MACHINE=alphaev67 ;; 3.441 + EV68*) UNAME_MACHINE=alphaev68 ;; 3.442 + esac 3.443 + objdump --private-headers /bin/sh | grep -q ld.so.1 3.444 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 3.445 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 3.446 + exit ;; 3.447 arm*:Linux:*:*) 3.448 eval $set_cc_for_build 3.449 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 3.450 @@ -867,20 +914,40 @@ 3.451 then 3.452 echo ${UNAME_MACHINE}-unknown-linux-gnu 3.453 else 3.454 - echo ${UNAME_MACHINE}-unknown-linux-gnueabi 3.455 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ 3.456 + | grep -q __ARM_PCS_VFP 3.457 + then 3.458 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi 3.459 + else 3.460 + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf 3.461 + fi 3.462 fi 3.463 exit ;; 3.464 avr32*:Linux:*:*) 3.465 echo ${UNAME_MACHINE}-unknown-linux-gnu 3.466 exit ;; 3.467 cris:Linux:*:*) 3.468 - echo cris-axis-linux-gnu 3.469 + echo ${UNAME_MACHINE}-axis-linux-gnu 3.470 exit ;; 3.471 crisv32:Linux:*:*) 3.472 - echo crisv32-axis-linux-gnu 3.473 + echo ${UNAME_MACHINE}-axis-linux-gnu 3.474 exit ;; 3.475 frv:Linux:*:*) 3.476 - echo frv-unknown-linux-gnu 3.477 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.478 + exit ;; 3.479 + hexagon:Linux:*:*) 3.480 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.481 + exit ;; 3.482 + i*86:Linux:*:*) 3.483 + LIBC=gnu 3.484 + eval $set_cc_for_build 3.485 + sed 's/^ //' << EOF >$dummy.c 3.486 + #ifdef __dietlibc__ 3.487 + LIBC=dietlibc 3.488 + #endif 3.489 +EOF 3.490 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` 3.491 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 3.492 exit ;; 3.493 ia64:Linux:*:*) 3.494 echo ${UNAME_MACHINE}-unknown-linux-gnu 3.495 @@ -891,74 +958,33 @@ 3.496 m68*:Linux:*:*) 3.497 echo ${UNAME_MACHINE}-unknown-linux-gnu 3.498 exit ;; 3.499 - mips:Linux:*:*) 3.500 + mips:Linux:*:* | mips64:Linux:*:*) 3.501 eval $set_cc_for_build 3.502 sed 's/^ //' << EOF >$dummy.c 3.503 #undef CPU 3.504 - #undef mips 3.505 - #undef mipsel 3.506 + #undef ${UNAME_MACHINE} 3.507 + #undef ${UNAME_MACHINE}el 3.508 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 3.509 - CPU=mipsel 3.510 + CPU=${UNAME_MACHINE}el 3.511 #else 3.512 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 3.513 - CPU=mips 3.514 + CPU=${UNAME_MACHINE} 3.515 #else 3.516 CPU= 3.517 #endif 3.518 #endif 3.519 EOF 3.520 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 3.521 - /^CPU/{ 3.522 - s: ::g 3.523 - p 3.524 - }'`" 3.525 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 3.526 - ;; 3.527 - mips64:Linux:*:*) 3.528 - eval $set_cc_for_build 3.529 - sed 's/^ //' << EOF >$dummy.c 3.530 - #undef CPU 3.531 - #undef mips64 3.532 - #undef mips64el 3.533 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 3.534 - CPU=mips64el 3.535 - #else 3.536 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 3.537 - CPU=mips64 3.538 - #else 3.539 - CPU= 3.540 - #endif 3.541 - #endif 3.542 -EOF 3.543 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 3.544 - /^CPU/{ 3.545 - s: ::g 3.546 - p 3.547 - }'`" 3.548 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 3.549 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 3.550 ;; 3.551 or32:Linux:*:*) 3.552 - echo or32-unknown-linux-gnu 3.553 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.554 exit ;; 3.555 - ppc:Linux:*:*) 3.556 - echo powerpc-unknown-linux-gnu 3.557 + padre:Linux:*:*) 3.558 + echo sparc-unknown-linux-gnu 3.559 exit ;; 3.560 - ppc64:Linux:*:*) 3.561 - echo powerpc64-unknown-linux-gnu 3.562 - exit ;; 3.563 - alpha:Linux:*:*) 3.564 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 3.565 - EV5) UNAME_MACHINE=alphaev5 ;; 3.566 - EV56) UNAME_MACHINE=alphaev56 ;; 3.567 - PCA56) UNAME_MACHINE=alphapca56 ;; 3.568 - PCA57) UNAME_MACHINE=alphapca56 ;; 3.569 - EV6) UNAME_MACHINE=alphaev6 ;; 3.570 - EV67) UNAME_MACHINE=alphaev67 ;; 3.571 - EV68*) UNAME_MACHINE=alphaev68 ;; 3.572 - esac 3.573 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null 3.574 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 3.575 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 3.576 + parisc64:Linux:*:* | hppa64:Linux:*:*) 3.577 + echo hppa64-unknown-linux-gnu 3.578 exit ;; 3.579 parisc:Linux:*:* | hppa:Linux:*:*) 3.580 # Look for CPU level 3.581 @@ -968,14 +994,17 @@ 3.582 *) echo hppa-unknown-linux-gnu ;; 3.583 esac 3.584 exit ;; 3.585 - parisc64:Linux:*:* | hppa64:Linux:*:*) 3.586 - echo hppa64-unknown-linux-gnu 3.587 + ppc64:Linux:*:*) 3.588 + echo powerpc64-unknown-linux-gnu 3.589 + exit ;; 3.590 + ppc:Linux:*:*) 3.591 + echo powerpc-unknown-linux-gnu 3.592 exit ;; 3.593 s390:Linux:*:* | s390x:Linux:*:*) 3.594 echo ${UNAME_MACHINE}-ibm-linux 3.595 exit ;; 3.596 sh64*:Linux:*:*) 3.597 - echo ${UNAME_MACHINE}-unknown-linux-gnu 3.598 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.599 exit ;; 3.600 sh*:Linux:*:*) 3.601 echo ${UNAME_MACHINE}-unknown-linux-gnu 3.602 @@ -983,78 +1012,18 @@ 3.603 sparc:Linux:*:* | sparc64:Linux:*:*) 3.604 echo ${UNAME_MACHINE}-unknown-linux-gnu 3.605 exit ;; 3.606 + tile*:Linux:*:*) 3.607 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.608 + exit ;; 3.609 vax:Linux:*:*) 3.610 echo ${UNAME_MACHINE}-dec-linux-gnu 3.611 exit ;; 3.612 x86_64:Linux:*:*) 3.613 - echo x86_64-unknown-linux-gnu 3.614 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.615 exit ;; 3.616 xtensa*:Linux:*:*) 3.617 - echo ${UNAME_MACHINE}-unknown-linux-gnu 3.618 + echo ${UNAME_MACHINE}-unknown-linux-gnu 3.619 exit ;; 3.620 - i*86:Linux:*:*) 3.621 - # The BFD linker knows what the default object file format is, so 3.622 - # first see if it will tell us. cd to the root directory to prevent 3.623 - # problems with other programs or directories called `ld' in the path. 3.624 - # Set LC_ALL=C to ensure ld outputs messages in English. 3.625 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ 3.626 - | sed -ne '/supported targets:/!d 3.627 - s/[ ][ ]*/ /g 3.628 - s/.*supported targets: *// 3.629 - s/ .*// 3.630 - p'` 3.631 - case "$ld_supported_targets" in 3.632 - elf32-i386) 3.633 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" 3.634 - ;; 3.635 - a.out-i386-linux) 3.636 - echo "${UNAME_MACHINE}-pc-linux-gnuaout" 3.637 - exit ;; 3.638 - coff-i386) 3.639 - echo "${UNAME_MACHINE}-pc-linux-gnucoff" 3.640 - exit ;; 3.641 - "") 3.642 - # Either a pre-BFD a.out linker (linux-gnuoldld) or 3.643 - # one that does not give us useful --help. 3.644 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" 3.645 - exit ;; 3.646 - esac 3.647 - # Determine whether the default compiler is a.out or elf 3.648 - eval $set_cc_for_build 3.649 - sed 's/^ //' << EOF >$dummy.c 3.650 - #include <features.h> 3.651 - #ifdef __ELF__ 3.652 - # ifdef __GLIBC__ 3.653 - # if __GLIBC__ >= 2 3.654 - LIBC=gnu 3.655 - # else 3.656 - LIBC=gnulibc1 3.657 - # endif 3.658 - # else 3.659 - LIBC=gnulibc1 3.660 - # endif 3.661 - #else 3.662 - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) 3.663 - LIBC=gnu 3.664 - #else 3.665 - LIBC=gnuaout 3.666 - #endif 3.667 - #endif 3.668 - #ifdef __dietlibc__ 3.669 - LIBC=dietlibc 3.670 - #endif 3.671 -EOF 3.672 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 3.673 - /^LIBC/{ 3.674 - s: ::g 3.675 - p 3.676 - }'`" 3.677 - test x"${LIBC}" != x && { 3.678 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 3.679 - exit 3.680 - } 3.681 - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } 3.682 - ;; 3.683 i*86:DYNIX/ptx:4*:*) 3.684 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 3.685 # earlier versions are messed up and put the nodename in both 3.686 @@ -1062,11 +1031,11 @@ 3.687 echo i386-sequent-sysv4 3.688 exit ;; 3.689 i*86:UNIX_SV:4.2MP:2.*) 3.690 - # Unixware is an offshoot of SVR4, but it has its own version 3.691 - # number series starting with 2... 3.692 - # I am not positive that other SVR4 systems won't match this, 3.693 + # Unixware is an offshoot of SVR4, but it has its own version 3.694 + # number series starting with 2... 3.695 + # I am not positive that other SVR4 systems won't match this, 3.696 # I just have to hope. -- rms. 3.697 - # Use sysv4.2uw... so that sysv4* matches it. 3.698 + # Use sysv4.2uw... so that sysv4* matches it. 3.699 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 3.700 exit ;; 3.701 i*86:OS/2:*:*) 3.702 @@ -1083,7 +1052,7 @@ 3.703 i*86:syllable:*:*) 3.704 echo ${UNAME_MACHINE}-pc-syllable 3.705 exit ;; 3.706 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) 3.707 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) 3.708 echo i386-unknown-lynxos${UNAME_RELEASE} 3.709 exit ;; 3.710 i*86:*DOS:*:*) 3.711 @@ -1098,7 +1067,7 @@ 3.712 fi 3.713 exit ;; 3.714 i*86:*:5:[678]*) 3.715 - # UnixWare 7.x, OpenUNIX and OpenServer 6. 3.716 + # UnixWare 7.x, OpenUNIX and OpenServer 6. 3.717 case `/bin/uname -X | grep "^Machine"` in 3.718 *486*) UNAME_MACHINE=i486 ;; 3.719 *Pentium) UNAME_MACHINE=i586 ;; 3.720 @@ -1126,10 +1095,13 @@ 3.721 exit ;; 3.722 pc:*:*:*) 3.723 # Left here for compatibility: 3.724 - # uname -m prints for DJGPP always 'pc', but it prints nothing about 3.725 - # the processor, so we play safe by assuming i386. 3.726 - echo i386-pc-msdosdjgpp 3.727 - exit ;; 3.728 + # uname -m prints for DJGPP always 'pc', but it prints nothing about 3.729 + # the processor, so we play safe by assuming i586. 3.730 + # Note: whatever this is, it MUST be the same as what config.sub 3.731 + # prints for the "djgpp" host, or else GDB configury will decide that 3.732 + # this is a cross-build. 3.733 + echo i586-pc-msdosdjgpp 3.734 + exit ;; 3.735 Intel:Mach:3*:*) 3.736 echo i386-pc-mach3 3.737 exit ;; 3.738 @@ -1164,8 +1136,18 @@ 3.739 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 3.740 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3.741 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 3.742 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 3.743 - && { echo i486-ncr-sysv4; exit; } ;; 3.744 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 3.745 + && { echo i486-ncr-sysv4; exit; } ;; 3.746 + NCR*:*:4.2:* | MPRAS*:*:4.2:*) 3.747 + OS_REL='.3' 3.748 + test -r /etc/.relid \ 3.749 + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 3.750 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 3.751 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } 3.752 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 3.753 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } 3.754 + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ 3.755 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3.756 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 3.757 echo m68k-unknown-lynxos${UNAME_RELEASE} 3.758 exit ;; 3.759 @@ -1178,7 +1160,7 @@ 3.760 rs6000:LynxOS:2.*:*) 3.761 echo rs6000-unknown-lynxos${UNAME_RELEASE} 3.762 exit ;; 3.763 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) 3.764 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) 3.765 echo powerpc-unknown-lynxos${UNAME_RELEASE} 3.766 exit ;; 3.767 SM[BE]S:UNIX_SV:*:*) 3.768 @@ -1198,10 +1180,10 @@ 3.769 echo ns32k-sni-sysv 3.770 fi 3.771 exit ;; 3.772 - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 3.773 - # says <Richard.M.Bartel@ccMail.Census.GOV> 3.774 - echo i586-unisys-sysv4 3.775 - exit ;; 3.776 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 3.777 + # says <Richard.M.Bartel@ccMail.Census.GOV> 3.778 + echo i586-unisys-sysv4 3.779 + exit ;; 3.780 *:UNIX_System_V:4*:FTX*) 3.781 # From Gerald Hewes <hewes@openmarket.com>. 3.782 # How about differentiating between stratus architectures? -djm 3.783 @@ -1227,11 +1209,11 @@ 3.784 exit ;; 3.785 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) 3.786 if [ -d /usr/nec ]; then 3.787 - echo mips-nec-sysv${UNAME_RELEASE} 3.788 + echo mips-nec-sysv${UNAME_RELEASE} 3.789 else 3.790 - echo mips-unknown-sysv${UNAME_RELEASE} 3.791 + echo mips-unknown-sysv${UNAME_RELEASE} 3.792 fi 3.793 - exit ;; 3.794 + exit ;; 3.795 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. 3.796 echo powerpc-be-beos 3.797 exit ;; 3.798 @@ -1241,6 +1223,9 @@ 3.799 BePC:BeOS:*:*) # BeOS running on Intel PC compatible. 3.800 echo i586-pc-beos 3.801 exit ;; 3.802 + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. 3.803 + echo i586-pc-haiku 3.804 + exit ;; 3.805 SX-4:SUPER-UX:*:*) 3.806 echo sx4-nec-superux${UNAME_RELEASE} 3.807 exit ;; 3.808 @@ -1267,12 +1252,17 @@ 3.809 exit ;; 3.810 *:Darwin:*:*) 3.811 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 3.812 - eval $set_cc_for_build 3.813 - echo "int main(){}" > $dummy.c 3.814 - if test "`$CC_FOR_BUILD -o $dummy $dummy.c; file $dummy | grep -c x86_64`" = 1 ; then 3.815 - UNAME_PROCESSOR=x86_64 3.816 - fi 3.817 case $UNAME_PROCESSOR in 3.818 + i386) 3.819 + eval $set_cc_for_build 3.820 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 3.821 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ 3.822 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 3.823 + grep IS_64BIT_ARCH >/dev/null 3.824 + then 3.825 + UNAME_PROCESSOR="x86_64" 3.826 + fi 3.827 + fi ;; 3.828 unknown) UNAME_PROCESSOR=powerpc ;; 3.829 esac 3.830 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 3.831 @@ -1288,6 +1278,9 @@ 3.832 *:QNX:*:4*) 3.833 echo i386-pc-qnx 3.834 exit ;; 3.835 + NEO-?:NONSTOP_KERNEL:*:*) 3.836 + echo neo-tandem-nsk${UNAME_RELEASE} 3.837 + exit ;; 3.838 NSE-?:NONSTOP_KERNEL:*:*) 3.839 echo nse-tandem-nsk${UNAME_RELEASE} 3.840 exit ;; 3.841 @@ -1333,13 +1326,13 @@ 3.842 echo pdp10-unknown-its 3.843 exit ;; 3.844 SEI:*:*:SEIUX) 3.845 - echo mips-sei-seiux${UNAME_RELEASE} 3.846 + echo mips-sei-seiux${UNAME_RELEASE} 3.847 exit ;; 3.848 *:DragonFly:*:*) 3.849 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 3.850 exit ;; 3.851 *:*VMS:*:*) 3.852 - UNAME_MACHINE=`(uname -p) 2>/dev/null` 3.853 + UNAME_MACHINE=`(uname -p) 2>/dev/null` 3.854 case "${UNAME_MACHINE}" in 3.855 A*) echo alpha-dec-vms ; exit ;; 3.856 I*) echo ia64-dec-vms ; exit ;; 3.857 @@ -1354,6 +1347,12 @@ 3.858 i*86:rdos:*:*) 3.859 echo ${UNAME_MACHINE}-pc-rdos 3.860 exit ;; 3.861 + i*86:AROS:*:*) 3.862 + echo ${UNAME_MACHINE}-pc-aros 3.863 + exit ;; 3.864 + x86_64:VMkernel:*:*) 3.865 + echo ${UNAME_MACHINE}-unknown-esx 3.866 + exit ;; 3.867 esac 3.868 3.869 #echo '(No uname command or uname output not recognized.)' 1>&2 3.870 @@ -1376,11 +1375,11 @@ 3.871 #include <sys/param.h> 3.872 printf ("m68k-sony-newsos%s\n", 3.873 #ifdef NEWSOS4 3.874 - "4" 3.875 + "4" 3.876 #else 3.877 - "" 3.878 + "" 3.879 #endif 3.880 - ); exit (0); 3.881 + ); exit (0); 3.882 #endif 3.883 #endif 3.884
4.1 --- a/common/autoconf/configure Tue Sep 17 08:08:01 2013 -0700 4.2 +++ b/common/autoconf/configure Tue Sep 17 19:06:17 2013 -0700 4.3 @@ -219,9 +219,4 @@ 4.4 echo configure exiting with result code $conf_result_code 4.5 fi 4.6 4.7 -# Move the log file to the output root, if this was successfully created 4.8 -if test -d "$OUTPUT_ROOT"; then 4.9 - mv -f config.log "$OUTPUT_ROOT" 2> /dev/null 4.10 -fi 4.11 - 4.12 exit $conf_result_code
5.1 --- a/common/autoconf/configure.ac Tue Sep 17 08:08:01 2013 -0700 5.2 +++ b/common/autoconf/configure.ac Tue Sep 17 19:06:17 2013 -0700 5.3 @@ -232,9 +232,15 @@ 5.4 # We're messing a bit with internal autoconf variables to put the config.status 5.5 # in the output directory instead of the current directory. 5.6 CONFIG_STATUS="$OUTPUT_ROOT/config.status" 5.7 + 5.8 # Create the actual output files. Now the main work of configure is done. 5.9 AC_OUTPUT 5.10 5.11 +# Try to move the config.log file to the output directory. 5.12 +if test -e ./config.log; then 5.13 + $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null 5.14 +fi 5.15 + 5.16 # Make the compare script executable 5.17 $CHMOD +x $OUTPUT_ROOT/compare.sh 5.18
6.1 --- a/common/autoconf/generated-configure.sh Tue Sep 17 08:08:01 2013 -0700 6.2 +++ b/common/autoconf/generated-configure.sh Tue Sep 17 19:06:17 2013 -0700 6.3 @@ -709,7 +709,6 @@ 6.4 SHARED_LIBRARY 6.5 OBJ_SUFFIX 6.6 COMPILER_NAME 6.7 -TARGET_BITS_FLAG 6.8 JT_HOME 6.9 JTREGEXE 6.10 LIPO 6.11 @@ -766,8 +765,6 @@ 6.12 BUILD_CXX 6.13 BUILD_CC 6.14 MSVCR_DLL 6.15 -DXSDK_INCLUDE_PATH 6.16 -DXSDK_LIB_PATH 6.17 VS_PATH 6.18 VS_LIB 6.19 VS_INCLUDE 6.20 @@ -1031,12 +1028,10 @@ 6.21 with_override_jaxp 6.22 with_override_jaxws 6.23 with_override_hotspot 6.24 +with_override_nashorn 6.25 with_override_jdk 6.26 with_import_hotspot 6.27 with_msvcr_dll 6.28 -with_dxsdk 6.29 -with_dxsdk_lib 6.30 -with_dxsdk_include 6.31 with_jtreg 6.32 with_extra_cflags 6.33 with_extra_cxxflags 6.34 @@ -1784,17 +1779,13 @@ 6.35 --with-override-jaxp use this jaxp dir for the build 6.36 --with-override-jaxws use this jaxws dir for the build 6.37 --with-override-hotspot use this hotspot dir for the build 6.38 + --with-override-nashorn use this nashorn dir for the build 6.39 --with-override-jdk use this jdk dir for the build 6.40 --with-import-hotspot import hotspot binaries from this jdk image or 6.41 hotspot build dist dir instead of building from 6.42 source 6.43 --with-msvcr-dll copy this msvcr100.dll into the built JDK (Windows 6.44 only) [probed] 6.45 - --with-dxsdk the DirectX SDK (Windows only) [probed] 6.46 - --with-dxsdk-lib the DirectX SDK lib directory (Windows only) 6.47 - [probed] 6.48 - --with-dxsdk-include the DirectX SDK include directory (Windows only) 6.49 - [probed] 6.50 --with-jtreg Regression Test Harness [probed] 6.51 --with-extra-cflags extra flags to be used when compiling jdk c-files 6.52 --with-extra-cxxflags extra flags to be used when compiling jdk c++-files 6.53 @@ -3805,10 +3796,6 @@ 6.54 6.55 6.56 6.57 -# Setup the DXSDK paths 6.58 - 6.59 - 6.60 - 6.61 6.62 6.63 6.64 @@ -3818,7 +3805,7 @@ 6.65 #CUSTOM_AUTOCONF_INCLUDE 6.66 6.67 # Do not change or remove the following line, it is needed for consistency checks: 6.68 -DATE_WHEN_GENERATED=1378914658 6.69 +DATE_WHEN_GENERATED=1379077060 6.70 6.71 ############################################################################### 6.72 # 6.73 @@ -16102,6 +16089,10 @@ 6.74 test -f $with_add_source_root/hotspot/make/Makefile; then 6.75 as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5 6.76 fi 6.77 + if test -f $with_add_source_root/nashorn/makefiles/Makefile || \ 6.78 + test -f $with_add_source_root/nashorn/make/Makefile; then 6.79 + as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5 6.80 + fi 6.81 if test -f $with_add_source_root/jdk/makefiles/Makefile || \ 6.82 test -f $with_add_source_root/jdk/make/Makefile; then 6.83 as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5 6.84 @@ -16137,6 +16128,10 @@ 6.85 test -f $with_override_source_root/hotspot/make/Makefile; then 6.86 as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5 6.87 fi 6.88 + if test -f $with_override_source_root/nashorn/makefiles/Makefile || \ 6.89 + test -f $with_override_source_root/nashorn/make/Makefile; then 6.90 + as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5 6.91 + fi 6.92 if test -f $with_override_source_root/jdk/makefiles/Makefile || \ 6.93 test -f $with_override_source_root/jdk/make/Makefile; then 6.94 as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5 6.95 @@ -16199,6 +16194,13 @@ 6.96 6.97 6.98 6.99 +# Check whether --with-override-nashorn was given. 6.100 +if test "${with_override_nashorn+set}" = set; then : 6.101 + withval=$with_override_nashorn; 6.102 +fi 6.103 + 6.104 + 6.105 + 6.106 # Check whether --with-override-jdk was given. 6.107 if test "${with_override_jdk+set}" = set; then : 6.108 withval=$with_override_jdk; 6.109 @@ -16276,7 +16278,7 @@ 6.110 cd "$with_override_nashorn" 6.111 NASHORN_TOPDIR="`pwd`" 6.112 cd "$CURDIR" 6.113 - if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then 6.114 + if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then 6.115 as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5 6.116 fi 6.117 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5 6.118 @@ -17582,441 +17584,6 @@ 6.119 fi 6.120 6.121 6.122 - 6.123 - 6.124 -# Check whether --with-dxsdk was given. 6.125 -if test "${with_dxsdk+set}" = set; then : 6.126 - withval=$with_dxsdk; 6.127 -fi 6.128 - 6.129 - 6.130 -# Check whether --with-dxsdk-lib was given. 6.131 -if test "${with_dxsdk_lib+set}" = set; then : 6.132 - withval=$with_dxsdk_lib; 6.133 -fi 6.134 - 6.135 - 6.136 -# Check whether --with-dxsdk-include was given. 6.137 -if test "${with_dxsdk_include+set}" = set; then : 6.138 - withval=$with_dxsdk_include; 6.139 -fi 6.140 - 6.141 - 6.142 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK" >&5 6.143 -$as_echo_n "checking for DirectX SDK... " >&6; } 6.144 - 6.145 - if test "x$with_dxsdk" != x; then 6.146 - dxsdk_path="$with_dxsdk" 6.147 - elif test "x$DXSDK_DIR" != x; then 6.148 - dxsdk_path="$DXSDK_DIR" 6.149 - elif test -d "C:/DXSDK"; then 6.150 - dxsdk_path="C:/DXSDK" 6.151 - else 6.152 - as_fn_error $? "Could not find the DirectX SDK" "$LINENO" 5 6.153 - fi 6.154 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dxsdk_path" >&5 6.155 -$as_echo "$dxsdk_path" >&6; } 6.156 - 6.157 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 6.158 - 6.159 - # Input might be given as Windows format, start by converting to 6.160 - # unix format. 6.161 - path="$dxsdk_path" 6.162 - new_path=`$CYGPATH -u "$path"` 6.163 - 6.164 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 6.165 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 6.166 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 6.167 - # "foo.exe" is OK but "foo" is an error. 6.168 - # 6.169 - # This test is therefore slightly more accurate than "test -f" to check for file precense. 6.170 - # It is also a way to make sure we got the proper file name for the real test later on. 6.171 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 6.172 - if test "x$test_shortpath" = x; then 6.173 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&5 6.174 -$as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&6;} 6.175 - as_fn_error $? "Cannot locate the the path of dxsdk_path" "$LINENO" 5 6.176 - fi 6.177 - 6.178 - # Call helper function which possibly converts this using DOS-style short mode. 6.179 - # If so, the updated path is stored in $new_path. 6.180 - 6.181 - input_path="$new_path" 6.182 - # Check if we need to convert this using DOS-style short mode. If the path 6.183 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 6.184 - # take no chances and rewrite it. 6.185 - # Note: m4 eats our [], so we need to use [ and ] instead. 6.186 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 6.187 - if test "x$has_forbidden_chars" != x; then 6.188 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 6.189 - shortmode_path=`$CYGPATH -s -m -a "$input_path"` 6.190 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 6.191 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 6.192 - # Going to short mode and back again did indeed matter. Since short mode is 6.193 - # case insensitive, let's make it lowercase to improve readability. 6.194 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 6.195 - # Now convert it back to Unix-stile (cygpath) 6.196 - input_path=`$CYGPATH -u "$shortmode_path"` 6.197 - new_path="$input_path" 6.198 - fi 6.199 - fi 6.200 - 6.201 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 6.202 - if test "x$test_cygdrive_prefix" = x; then 6.203 - # As a simple fix, exclude /usr/bin since it's not a real path. 6.204 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then 6.205 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to 6.206 - # a path prefixed by /cygdrive for fixpath to work. 6.207 - new_path="$CYGWIN_ROOT_PATH$input_path" 6.208 - fi 6.209 - fi 6.210 - 6.211 - 6.212 - if test "x$path" != "x$new_path"; then 6.213 - dxsdk_path="$new_path" 6.214 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting dxsdk_path to \"$new_path\"" >&5 6.215 -$as_echo "$as_me: Rewriting dxsdk_path to \"$new_path\"" >&6;} 6.216 - fi 6.217 - 6.218 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 6.219 - 6.220 - path="$dxsdk_path" 6.221 - has_colon=`$ECHO $path | $GREP ^.:` 6.222 - new_path="$path" 6.223 - if test "x$has_colon" = x; then 6.224 - # Not in mixed or Windows style, start by that. 6.225 - new_path=`cmd //c echo $path` 6.226 - fi 6.227 - 6.228 - 6.229 - input_path="$new_path" 6.230 - # Check if we need to convert this using DOS-style short mode. If the path 6.231 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 6.232 - # take no chances and rewrite it. 6.233 - # Note: m4 eats our [], so we need to use [ and ] instead. 6.234 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 6.235 - if test "x$has_forbidden_chars" != x; then 6.236 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 6.237 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 6.238 - fi 6.239 - 6.240 - 6.241 - windows_path="$new_path" 6.242 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 6.243 - unix_path=`$CYGPATH -u "$windows_path"` 6.244 - new_path="$unix_path" 6.245 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 6.246 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 6.247 - new_path="$unix_path" 6.248 - fi 6.249 - 6.250 - if test "x$path" != "x$new_path"; then 6.251 - dxsdk_path="$new_path" 6.252 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting dxsdk_path to \"$new_path\"" >&5 6.253 -$as_echo "$as_me: Rewriting dxsdk_path to \"$new_path\"" >&6;} 6.254 - fi 6.255 - 6.256 - # Save the first 10 bytes of this path to the storage, so fixpath can work. 6.257 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 6.258 - 6.259 - else 6.260 - # We're on a posix platform. Hooray! :) 6.261 - path="$dxsdk_path" 6.262 - has_space=`$ECHO "$path" | $GREP " "` 6.263 - if test "x$has_space" != x; then 6.264 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&5 6.265 -$as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&6;} 6.266 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 6.267 - fi 6.268 - 6.269 - # Use eval to expand a potential ~ 6.270 - eval path="$path" 6.271 - if test ! -f "$path" && test ! -d "$path"; then 6.272 - as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5 6.273 - fi 6.274 - 6.275 - dxsdk_path="`cd "$path"; $THEPWDCMD -L`" 6.276 - fi 6.277 - 6.278 - 6.279 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK lib dir" >&5 6.280 -$as_echo_n "checking for DirectX SDK lib dir... " >&6; } 6.281 - if test "x$with_dxsdk_lib" != x; then 6.282 - DXSDK_LIB_PATH="$with_dxsdk_lib" 6.283 - elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then 6.284 - DXSDK_LIB_PATH="$dxsdk_path/Lib/x64" 6.285 - else 6.286 - DXSDK_LIB_PATH="$dxsdk_path/Lib" 6.287 - fi 6.288 - # dsound.lib is linked to in jsoundds 6.289 - if test ! -f "$DXSDK_LIB_PATH/dsound.lib"; then 6.290 - as_fn_error $? "Invalid DirectX SDK lib dir" "$LINENO" 5 6.291 - fi 6.292 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DXSDK_LIB_PATH" >&5 6.293 -$as_echo "$DXSDK_LIB_PATH" >&6; } 6.294 - 6.295 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 6.296 - 6.297 - # Input might be given as Windows format, start by converting to 6.298 - # unix format. 6.299 - path="$DXSDK_LIB_PATH" 6.300 - new_path=`$CYGPATH -u "$path"` 6.301 - 6.302 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 6.303 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 6.304 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 6.305 - # "foo.exe" is OK but "foo" is an error. 6.306 - # 6.307 - # This test is therefore slightly more accurate than "test -f" to check for file precense. 6.308 - # It is also a way to make sure we got the proper file name for the real test later on. 6.309 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 6.310 - if test "x$test_shortpath" = x; then 6.311 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&5 6.312 -$as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&6;} 6.313 - as_fn_error $? "Cannot locate the the path of DXSDK_LIB_PATH" "$LINENO" 5 6.314 - fi 6.315 - 6.316 - # Call helper function which possibly converts this using DOS-style short mode. 6.317 - # If so, the updated path is stored in $new_path. 6.318 - 6.319 - input_path="$new_path" 6.320 - # Check if we need to convert this using DOS-style short mode. If the path 6.321 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 6.322 - # take no chances and rewrite it. 6.323 - # Note: m4 eats our [], so we need to use [ and ] instead. 6.324 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 6.325 - if test "x$has_forbidden_chars" != x; then 6.326 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 6.327 - shortmode_path=`$CYGPATH -s -m -a "$input_path"` 6.328 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 6.329 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 6.330 - # Going to short mode and back again did indeed matter. Since short mode is 6.331 - # case insensitive, let's make it lowercase to improve readability. 6.332 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 6.333 - # Now convert it back to Unix-stile (cygpath) 6.334 - input_path=`$CYGPATH -u "$shortmode_path"` 6.335 - new_path="$input_path" 6.336 - fi 6.337 - fi 6.338 - 6.339 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 6.340 - if test "x$test_cygdrive_prefix" = x; then 6.341 - # As a simple fix, exclude /usr/bin since it's not a real path. 6.342 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then 6.343 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to 6.344 - # a path prefixed by /cygdrive for fixpath to work. 6.345 - new_path="$CYGWIN_ROOT_PATH$input_path" 6.346 - fi 6.347 - fi 6.348 - 6.349 - 6.350 - if test "x$path" != "x$new_path"; then 6.351 - DXSDK_LIB_PATH="$new_path" 6.352 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&5 6.353 -$as_echo "$as_me: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&6;} 6.354 - fi 6.355 - 6.356 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 6.357 - 6.358 - path="$DXSDK_LIB_PATH" 6.359 - has_colon=`$ECHO $path | $GREP ^.:` 6.360 - new_path="$path" 6.361 - if test "x$has_colon" = x; then 6.362 - # Not in mixed or Windows style, start by that. 6.363 - new_path=`cmd //c echo $path` 6.364 - fi 6.365 - 6.366 - 6.367 - input_path="$new_path" 6.368 - # Check if we need to convert this using DOS-style short mode. If the path 6.369 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 6.370 - # take no chances and rewrite it. 6.371 - # Note: m4 eats our [], so we need to use [ and ] instead. 6.372 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 6.373 - if test "x$has_forbidden_chars" != x; then 6.374 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 6.375 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 6.376 - fi 6.377 - 6.378 - 6.379 - windows_path="$new_path" 6.380 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 6.381 - unix_path=`$CYGPATH -u "$windows_path"` 6.382 - new_path="$unix_path" 6.383 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 6.384 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 6.385 - new_path="$unix_path" 6.386 - fi 6.387 - 6.388 - if test "x$path" != "x$new_path"; then 6.389 - DXSDK_LIB_PATH="$new_path" 6.390 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&5 6.391 -$as_echo "$as_me: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&6;} 6.392 - fi 6.393 - 6.394 - # Save the first 10 bytes of this path to the storage, so fixpath can work. 6.395 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 6.396 - 6.397 - else 6.398 - # We're on a posix platform. Hooray! :) 6.399 - path="$DXSDK_LIB_PATH" 6.400 - has_space=`$ECHO "$path" | $GREP " "` 6.401 - if test "x$has_space" != x; then 6.402 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&5 6.403 -$as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&6;} 6.404 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 6.405 - fi 6.406 - 6.407 - # Use eval to expand a potential ~ 6.408 - eval path="$path" 6.409 - if test ! -f "$path" && test ! -d "$path"; then 6.410 - as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 6.411 - fi 6.412 - 6.413 - DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`" 6.414 - fi 6.415 - 6.416 - 6.417 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK include dir" >&5 6.418 -$as_echo_n "checking for DirectX SDK include dir... " >&6; } 6.419 - if test "x$with_dxsdk_include" != x; then 6.420 - DXSDK_INCLUDE_PATH="$with_dxsdk_include" 6.421 - else 6.422 - DXSDK_INCLUDE_PATH="$dxsdk_path/Include" 6.423 - fi 6.424 - # dsound.h is included in jsoundds 6.425 - if test ! -f "$DXSDK_INCLUDE_PATH/dsound.h"; then 6.426 - as_fn_error $? "Invalid DirectX SDK lib dir" "$LINENO" 5 6.427 - fi 6.428 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DXSDK_INCLUDE_PATH" >&5 6.429 -$as_echo "$DXSDK_INCLUDE_PATH" >&6; } 6.430 - 6.431 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 6.432 - 6.433 - # Input might be given as Windows format, start by converting to 6.434 - # unix format. 6.435 - path="$DXSDK_INCLUDE_PATH" 6.436 - new_path=`$CYGPATH -u "$path"` 6.437 - 6.438 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 6.439 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 6.440 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 6.441 - # "foo.exe" is OK but "foo" is an error. 6.442 - # 6.443 - # This test is therefore slightly more accurate than "test -f" to check for file precense. 6.444 - # It is also a way to make sure we got the proper file name for the real test later on. 6.445 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 6.446 - if test "x$test_shortpath" = x; then 6.447 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5 6.448 -$as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;} 6.449 - as_fn_error $? "Cannot locate the the path of DXSDK_INCLUDE_PATH" "$LINENO" 5 6.450 - fi 6.451 - 6.452 - # Call helper function which possibly converts this using DOS-style short mode. 6.453 - # If so, the updated path is stored in $new_path. 6.454 - 6.455 - input_path="$new_path" 6.456 - # Check if we need to convert this using DOS-style short mode. If the path 6.457 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 6.458 - # take no chances and rewrite it. 6.459 - # Note: m4 eats our [], so we need to use [ and ] instead. 6.460 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 6.461 - if test "x$has_forbidden_chars" != x; then 6.462 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 6.463 - shortmode_path=`$CYGPATH -s -m -a "$input_path"` 6.464 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 6.465 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 6.466 - # Going to short mode and back again did indeed matter. Since short mode is 6.467 - # case insensitive, let's make it lowercase to improve readability. 6.468 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 6.469 - # Now convert it back to Unix-stile (cygpath) 6.470 - input_path=`$CYGPATH -u "$shortmode_path"` 6.471 - new_path="$input_path" 6.472 - fi 6.473 - fi 6.474 - 6.475 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 6.476 - if test "x$test_cygdrive_prefix" = x; then 6.477 - # As a simple fix, exclude /usr/bin since it's not a real path. 6.478 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then 6.479 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to 6.480 - # a path prefixed by /cygdrive for fixpath to work. 6.481 - new_path="$CYGWIN_ROOT_PATH$input_path" 6.482 - fi 6.483 - fi 6.484 - 6.485 - 6.486 - if test "x$path" != "x$new_path"; then 6.487 - DXSDK_INCLUDE_PATH="$new_path" 6.488 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&5 6.489 -$as_echo "$as_me: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&6;} 6.490 - fi 6.491 - 6.492 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 6.493 - 6.494 - path="$DXSDK_INCLUDE_PATH" 6.495 - has_colon=`$ECHO $path | $GREP ^.:` 6.496 - new_path="$path" 6.497 - if test "x$has_colon" = x; then 6.498 - # Not in mixed or Windows style, start by that. 6.499 - new_path=`cmd //c echo $path` 6.500 - fi 6.501 - 6.502 - 6.503 - input_path="$new_path" 6.504 - # Check if we need to convert this using DOS-style short mode. If the path 6.505 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 6.506 - # take no chances and rewrite it. 6.507 - # Note: m4 eats our [], so we need to use [ and ] instead. 6.508 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 6.509 - if test "x$has_forbidden_chars" != x; then 6.510 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 6.511 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 6.512 - fi 6.513 - 6.514 - 6.515 - windows_path="$new_path" 6.516 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 6.517 - unix_path=`$CYGPATH -u "$windows_path"` 6.518 - new_path="$unix_path" 6.519 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 6.520 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 6.521 - new_path="$unix_path" 6.522 - fi 6.523 - 6.524 - if test "x$path" != "x$new_path"; then 6.525 - DXSDK_INCLUDE_PATH="$new_path" 6.526 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&5 6.527 -$as_echo "$as_me: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&6;} 6.528 - fi 6.529 - 6.530 - # Save the first 10 bytes of this path to the storage, so fixpath can work. 6.531 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 6.532 - 6.533 - else 6.534 - # We're on a posix platform. Hooray! :) 6.535 - path="$DXSDK_INCLUDE_PATH" 6.536 - has_space=`$ECHO "$path" | $GREP " "` 6.537 - if test "x$has_space" != x; then 6.538 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5 6.539 -$as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;} 6.540 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 6.541 - fi 6.542 - 6.543 - # Use eval to expand a potential ~ 6.544 - eval path="$path" 6.545 - if test ! -f "$path" && test ! -d "$path"; then 6.546 - as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 6.547 - fi 6.548 - 6.549 - DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" 6.550 - fi 6.551 - 6.552 - 6.553 - 6.554 - 6.555 - LDFLAGS_JDK="$LDFLAGS_JDK -libpath:$DXSDK_LIB_PATH" 6.556 - 6.557 fi 6.558 6.559 6.560 @@ -28830,35 +28397,41 @@ 6.561 if test "x$OPENJDK_TARGET_OS" = xsolaris; then 6.562 # Always specify -m flags on Solaris 6.563 6.564 - # keep track of c/cxx flags that we added outselves... 6.565 - # to prevent emitting warning... 6.566 - TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" 6.567 - 6.568 - 6.569 - CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}" 6.570 - CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}" 6.571 - LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}" 6.572 - 6.573 - CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.574 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.575 - LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.576 + # When we add flags to the "official" CFLAGS etc, we need to 6.577 + # keep track of these additions in ADDED_CFLAGS etc. These 6.578 + # will later be checked to make sure only controlled additions 6.579 + # have been made to CFLAGS etc. 6.580 + ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.581 + ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.582 + ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.583 + 6.584 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}" 6.585 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" 6.586 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" 6.587 + 6.588 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" 6.589 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" 6.590 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" 6.591 6.592 elif test "x$COMPILE_TYPE" = xreduced; then 6.593 if test "x$OPENJDK_TARGET_OS" != xwindows; then 6.594 # Specify -m if running reduced on other Posix platforms 6.595 6.596 - # keep track of c/cxx flags that we added outselves... 6.597 - # to prevent emitting warning... 6.598 - TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" 6.599 - 6.600 - 6.601 - CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}" 6.602 - CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}" 6.603 - LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}" 6.604 - 6.605 - CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.606 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.607 - LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.608 + # When we add flags to the "official" CFLAGS etc, we need to 6.609 + # keep track of these additions in ADDED_CFLAGS etc. These 6.610 + # will later be checked to make sure only controlled additions 6.611 + # have been made to CFLAGS etc. 6.612 + ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.613 + ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.614 + ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.615 + 6.616 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}" 6.617 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" 6.618 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" 6.619 + 6.620 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" 6.621 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" 6.622 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" 6.623 6.624 fi 6.625 fi 6.626 @@ -33618,6 +33191,7 @@ 6.627 # We're messing a bit with internal autoconf variables to put the config.status 6.628 # in the output directory instead of the current directory. 6.629 CONFIG_STATUS="$OUTPUT_ROOT/config.status" 6.630 + 6.631 # Create the actual output files. Now the main work of configure is done. 6.632 cat >confcache <<\_ACEOF 6.633 # This file is a shell script that caches the results of configure 6.634 @@ -34899,6 +34473,11 @@ 6.635 fi 6.636 6.637 6.638 +# Try to move the config.log file to the output directory. 6.639 +if test -e ./config.log; then 6.640 + $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null 6.641 +fi 6.642 + 6.643 # Make the compare script executable 6.644 $CHMOD +x $OUTPUT_ROOT/compare.sh 6.645
7.1 --- a/common/autoconf/platform.m4 Tue Sep 17 08:08:01 2013 -0700 7.2 +++ b/common/autoconf/platform.m4 Tue Sep 17 19:06:17 2013 -0700 7.3 @@ -422,18 +422,21 @@ 7.4 # Add -mX to various FLAGS variables. 7.5 AC_DEFUN([PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS], 7.6 [ 7.7 - # keep track of c/cxx flags that we added outselves... 7.8 - # to prevent emitting warning... 7.9 - TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" 7.10 - AC_SUBST(TARGET_BITS_FLAG) 7.11 + # When we add flags to the "official" CFLAGS etc, we need to 7.12 + # keep track of these additions in ADDED_CFLAGS etc. These 7.13 + # will later be checked to make sure only controlled additions 7.14 + # have been made to CFLAGS etc. 7.15 + ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 7.16 + ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 7.17 + ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 7.18 7.19 - CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}" 7.20 - CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}" 7.21 - LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}" 7.22 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}" 7.23 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" 7.24 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" 7.25 7.26 - CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}" 7.27 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}" 7.28 - LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}" 7.29 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" 7.30 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" 7.31 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" 7.32 ]) 7.33 7.34 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
8.1 --- a/common/autoconf/source-dirs.m4 Tue Sep 17 08:08:01 2013 -0700 8.2 +++ b/common/autoconf/source-dirs.m4 Tue Sep 17 19:06:17 2013 -0700 8.3 @@ -101,6 +101,10 @@ 8.4 test -f $with_add_source_root/hotspot/make/Makefile; then 8.5 AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.]) 8.6 fi 8.7 + if test -f $with_add_source_root/nashorn/makefiles/Makefile || \ 8.8 + test -f $with_add_source_root/nashorn/make/Makefile; then 8.9 + AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.]) 8.10 + fi 8.11 if test -f $with_add_source_root/jdk/makefiles/Makefile || \ 8.12 test -f $with_add_source_root/jdk/make/Makefile; then 8.13 AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.]) 8.14 @@ -136,6 +140,10 @@ 8.15 test -f $with_override_source_root/hotspot/make/Makefile; then 8.16 AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.]) 8.17 fi 8.18 + if test -f $with_override_source_root/nashorn/makefiles/Makefile || \ 8.19 + test -f $with_override_source_root/nashorn/make/Makefile; then 8.20 + AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.]) 8.21 + fi 8.22 if test -f $with_override_source_root/jdk/makefiles/Makefile || \ 8.23 test -f $with_override_source_root/jdk/make/Makefile; then 8.24 AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.]) 8.25 @@ -177,6 +185,9 @@ 8.26 AC_ARG_WITH(override-hotspot, [AS_HELP_STRING([--with-override-hotspot], 8.27 [use this hotspot dir for the build])]) 8.28 8.29 +AC_ARG_WITH(override-nashorn, [AS_HELP_STRING([--with-override-nashorn], 8.30 + [use this nashorn dir for the build])]) 8.31 + 8.32 AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk], 8.33 [use this jdk dir for the build])]) 8.34 8.35 @@ -241,7 +252,7 @@ 8.36 cd "$with_override_nashorn" 8.37 NASHORN_TOPDIR="`pwd`" 8.38 cd "$CURDIR" 8.39 - if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then 8.40 + if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then 8.41 AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!]) 8.42 fi 8.43 AC_MSG_CHECKING([if nashorn should be overridden])
9.1 --- a/common/autoconf/spec.gmk.in Tue Sep 17 08:08:01 2013 -0700 9.2 +++ b/common/autoconf/spec.gmk.in Tue Sep 17 19:06:17 2013 -0700 9.3 @@ -291,10 +291,6 @@ 9.4 X_LIBS:=@X_LIBS@ 9.5 OPENWIN_HOME:=@OPENWIN_HOME@ 9.6 9.7 -# DirectX SDK 9.8 -DXSDK_LIB_PATH=@DXSDK_LIB_PATH@ 9.9 -DXSDK_INCLUDE_PATH=@DXSDK_INCLUDE_PATH@ 9.10 - 9.11 # The lowest required version of macosx to enforce compatiblity for 9.12 MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@ 9.13 9.14 @@ -304,7 +300,6 @@ 9.15 COMPILER_TYPE:=@COMPILER_TYPE@ 9.16 COMPILER_NAME:=@COMPILER_NAME@ 9.17 9.18 -TARGET_BITS_FLAG=@TARGET_BITS_FLAG@ 9.19 COMPILER_SUPPORTS_TARGET_BITS_FLAG=@COMPILER_SUPPORTS_TARGET_BITS_FLAG@ 9.20 9.21 CC_OUT_OPTION:=@CC_OUT_OPTION@
10.1 --- a/common/autoconf/toolchain.m4 Tue Sep 17 08:08:01 2013 -0700 10.2 +++ b/common/autoconf/toolchain.m4 Tue Sep 17 19:06:17 2013 -0700 10.3 @@ -176,7 +176,6 @@ 10.4 [ 10.5 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 10.6 TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV 10.7 - TOOLCHAIN_SETUP_DXSDK 10.8 fi 10.9 10.10 AC_SUBST(MSVCR_DLL)
11.1 --- a/common/autoconf/toolchain_windows.m4 Tue Sep 17 08:08:01 2013 -0700 11.2 +++ b/common/autoconf/toolchain_windows.m4 Tue Sep 17 19:06:17 2013 -0700 11.3 @@ -277,61 +277,3 @@ 11.4 AC_MSG_RESULT([$MSVCR_DLL]) 11.5 BASIC_FIXUP_PATH(MSVCR_DLL) 11.6 ]) 11.7 - 11.8 - 11.9 -# Setup the DXSDK paths 11.10 -AC_DEFUN([TOOLCHAIN_SETUP_DXSDK], 11.11 -[ 11.12 - AC_ARG_WITH(dxsdk, [AS_HELP_STRING([--with-dxsdk], 11.13 - [the DirectX SDK (Windows only) @<:@probed@:>@])]) 11.14 - AC_ARG_WITH(dxsdk-lib, [AS_HELP_STRING([--with-dxsdk-lib], 11.15 - [the DirectX SDK lib directory (Windows only) @<:@probed@:>@])]) 11.16 - AC_ARG_WITH(dxsdk-include, [AS_HELP_STRING([--with-dxsdk-include], 11.17 - [the DirectX SDK include directory (Windows only) @<:@probed@:>@])]) 11.18 - 11.19 - AC_MSG_CHECKING([for DirectX SDK]) 11.20 - 11.21 - if test "x$with_dxsdk" != x; then 11.22 - dxsdk_path="$with_dxsdk" 11.23 - elif test "x$DXSDK_DIR" != x; then 11.24 - dxsdk_path="$DXSDK_DIR" 11.25 - elif test -d "C:/DXSDK"; then 11.26 - dxsdk_path="C:/DXSDK" 11.27 - else 11.28 - AC_MSG_ERROR([Could not find the DirectX SDK]) 11.29 - fi 11.30 - AC_MSG_RESULT([$dxsdk_path]) 11.31 - BASIC_FIXUP_PATH(dxsdk_path) 11.32 - 11.33 - AC_MSG_CHECKING([for DirectX SDK lib dir]) 11.34 - if test "x$with_dxsdk_lib" != x; then 11.35 - DXSDK_LIB_PATH="$with_dxsdk_lib" 11.36 - elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then 11.37 - DXSDK_LIB_PATH="$dxsdk_path/Lib/x64" 11.38 - else 11.39 - DXSDK_LIB_PATH="$dxsdk_path/Lib" 11.40 - fi 11.41 - # dsound.lib is linked to in jsoundds 11.42 - if test ! -f "$DXSDK_LIB_PATH/dsound.lib"; then 11.43 - AC_MSG_ERROR([Invalid DirectX SDK lib dir]) 11.44 - fi 11.45 - AC_MSG_RESULT([$DXSDK_LIB_PATH]) 11.46 - BASIC_FIXUP_PATH(DXSDK_LIB_PATH) 11.47 - 11.48 - AC_MSG_CHECKING([for DirectX SDK include dir]) 11.49 - if test "x$with_dxsdk_include" != x; then 11.50 - DXSDK_INCLUDE_PATH="$with_dxsdk_include" 11.51 - else 11.52 - DXSDK_INCLUDE_PATH="$dxsdk_path/Include" 11.53 - fi 11.54 - # dsound.h is included in jsoundds 11.55 - if test ! -f "$DXSDK_INCLUDE_PATH/dsound.h"; then 11.56 - AC_MSG_ERROR([Invalid DirectX SDK lib dir]) 11.57 - fi 11.58 - AC_MSG_RESULT([$DXSDK_INCLUDE_PATH]) 11.59 - BASIC_FIXUP_PATH(DXSDK_INCLUDE_PATH) 11.60 - 11.61 - AC_SUBST(DXSDK_LIB_PATH) 11.62 - AC_SUBST(DXSDK_INCLUDE_PATH) 11.63 - LDFLAGS_JDK="$LDFLAGS_JDK -libpath:$DXSDK_LIB_PATH" 11.64 -])
