1.1 --- a/common/autoconf/platform.m4 Wed Oct 24 13:11:42 2012 -0700
1.2 +++ b/common/autoconf/platform.m4 Fri Oct 26 14:29:57 2012 -0700
1.3 @@ -87,22 +87,32 @@
1.4 *linux*)
1.5 VAR_OS=linux
1.6 VAR_OS_API=posix
1.7 + VAR_OS_ENV=linux
1.8 ;;
1.9 *solaris*)
1.10 VAR_OS=solaris
1.11 VAR_OS_API=posix
1.12 + VAR_OS_ENV=solaris
1.13 ;;
1.14 *darwin*)
1.15 VAR_OS=macosx
1.16 VAR_OS_API=posix
1.17 + VAR_OS_ENV=macosx
1.18 ;;
1.19 *bsd*)
1.20 VAR_OS=bsd
1.21 VAR_OS_API=posix
1.22 + VAR_OS_ENV=bsd
1.23 ;;
1.24 - *cygwin*|*windows*)
1.25 + *cygwin*)
1.26 VAR_OS=windows
1.27 VAR_OS_API=winapi
1.28 + VAR_OS_ENV=windows.cygwin
1.29 + ;;
1.30 + *mingw*)
1.31 + VAR_OS=windows
1.32 + VAR_OS_API=winapi
1.33 + VAR_OS_ENV=windows.msys
1.34 ;;
1.35 *)
1.36 AC_MSG_ERROR([unsupported operating system $1])
1.37 @@ -128,11 +138,33 @@
1.38 AC_SUBST(OPENJDK_BUILD_AUTOCONF_NAME)
1.39
1.40 # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
1.41 + PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
1.42 + PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
1.43 + # ..and setup our own variables. (Do this explicitely to facilitate searching)
1.44 + OPENJDK_BUILD_OS="$VAR_OS"
1.45 + OPENJDK_BUILD_OS_API="$VAR_OS_API"
1.46 + OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
1.47 + OPENJDK_BUILD_CPU="$VAR_CPU"
1.48 + OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
1.49 + OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
1.50 + OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
1.51 + AC_SUBST(OPENJDK_BUILD_OS)
1.52 + AC_SUBST(OPENJDK_BUILD_OS_API)
1.53 + AC_SUBST(OPENJDK_BUILD_CPU)
1.54 + AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
1.55 + AC_SUBST(OPENJDK_BUILD_CPU_BITS)
1.56 + AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN)
1.57 +
1.58 + AC_MSG_CHECKING([openjdk-build os-cpu])
1.59 + AC_MSG_RESULT([$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU])
1.60 +
1.61 + # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
1.62 PLATFORM_EXTRACT_VARS_FROM_OS($host_os)
1.63 PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
1.64 # ... and setup our own variables. (Do this explicitely to facilitate searching)
1.65 OPENJDK_TARGET_OS="$VAR_OS"
1.66 OPENJDK_TARGET_OS_API="$VAR_OS_API"
1.67 + OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
1.68 OPENJDK_TARGET_CPU="$VAR_CPU"
1.69 OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
1.70 OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
1.71 @@ -144,22 +176,8 @@
1.72 AC_SUBST(OPENJDK_TARGET_CPU_BITS)
1.73 AC_SUBST(OPENJDK_TARGET_CPU_ENDIAN)
1.74
1.75 - # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
1.76 - PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
1.77 - PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
1.78 - # ..and setup our own variables. (Do this explicitely to facilitate searching)
1.79 - OPENJDK_BUILD_OS="$VAR_OS"
1.80 - OPENJDK_BUILD_OS_API="$VAR_OS_API"
1.81 - OPENJDK_BUILD_CPU="$VAR_CPU"
1.82 - OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
1.83 - OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
1.84 - OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
1.85 - AC_SUBST(OPENJDK_BUILD_OS)
1.86 - AC_SUBST(OPENJDK_BUILD_OS_API)
1.87 - AC_SUBST(OPENJDK_BUILD_CPU)
1.88 - AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
1.89 - AC_SUBST(OPENJDK_BUILD_CPU_BITS)
1.90 - AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN)
1.91 + AC_MSG_CHECKING([openjdk-target os-cpu])
1.92 + AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
1.93 ])
1.94
1.95 # Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
1.96 @@ -208,7 +226,7 @@
1.97 fi
1.98 AC_SUBST(COMPILE_TYPE)
1.99
1.100 -AC_MSG_CHECKING([for compilation type])
1.101 +AC_MSG_CHECKING([compilation type])
1.102 AC_MSG_RESULT([$COMPILE_TYPE])
1.103 ])
1.104
1.105 @@ -299,7 +317,11 @@
1.106
1.107 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.108 A_LP64="LP64:="
1.109 - ADD_LP64="-D_LP64=1"
1.110 + # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
1.111 + # unpack200.exe
1.112 + if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.113 + ADD_LP64="-D_LP64=1"
1.114 + fi
1.115 fi
1.116 AC_SUBST(LP64,$A_LP64)
1.117
