Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/platform.m4
common/autoconf/platform.m4
- changeset 494
- e64f2cb57d05
- parent 478
- 2ba6f4da4bf3
- child 671
- 653ff6bcf0b1
equal
deleted
inserted
replaced
| 488:8a3fe0ae06a8 | 494:e64f2cb57d05 |
|---|---|
| 85 [ | 85 [ |
| 86 case "$1" in | 86 case "$1" in |
| 87 *linux*) | 87 *linux*) |
| 88 VAR_OS=linux | 88 VAR_OS=linux |
| 89 VAR_OS_API=posix | 89 VAR_OS_API=posix |
| 90 VAR_OS_ENV=linux | |
| 90 ;; | 91 ;; |
| 91 *solaris*) | 92 *solaris*) |
| 92 VAR_OS=solaris | 93 VAR_OS=solaris |
| 93 VAR_OS_API=posix | 94 VAR_OS_API=posix |
| 95 VAR_OS_ENV=solaris | |
| 94 ;; | 96 ;; |
| 95 *darwin*) | 97 *darwin*) |
| 96 VAR_OS=macosx | 98 VAR_OS=macosx |
| 97 VAR_OS_API=posix | 99 VAR_OS_API=posix |
| 100 VAR_OS_ENV=macosx | |
| 98 ;; | 101 ;; |
| 99 *bsd*) | 102 *bsd*) |
| 100 VAR_OS=bsd | 103 VAR_OS=bsd |
| 101 VAR_OS_API=posix | 104 VAR_OS_API=posix |
| 102 ;; | 105 VAR_OS_ENV=bsd |
| 103 *cygwin*|*windows*) | 106 ;; |
| 107 *cygwin*) | |
| 104 VAR_OS=windows | 108 VAR_OS=windows |
| 105 VAR_OS_API=winapi | 109 VAR_OS_API=winapi |
| 110 VAR_OS_ENV=windows.cygwin | |
| 111 ;; | |
| 112 *mingw*) | |
| 113 VAR_OS=windows | |
| 114 VAR_OS_API=winapi | |
| 115 VAR_OS_ENV=windows.msys | |
| 106 ;; | 116 ;; |
| 107 *) | 117 *) |
| 108 AC_MSG_ERROR([unsupported operating system $1]) | 118 AC_MSG_ERROR([unsupported operating system $1]) |
| 109 ;; | 119 ;; |
| 110 esac | 120 esac |
| 126 OPENJDK_BUILD_AUTOCONF_NAME="$build" | 136 OPENJDK_BUILD_AUTOCONF_NAME="$build" |
| 127 AC_SUBST(OPENJDK_TARGET_AUTOCONF_NAME) | 137 AC_SUBST(OPENJDK_TARGET_AUTOCONF_NAME) |
| 128 AC_SUBST(OPENJDK_BUILD_AUTOCONF_NAME) | 138 AC_SUBST(OPENJDK_BUILD_AUTOCONF_NAME) |
| 129 | 139 |
| 130 # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. | 140 # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. |
| 141 PLATFORM_EXTRACT_VARS_FROM_OS($build_os) | |
| 142 PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu) | |
| 143 # ..and setup our own variables. (Do this explicitely to facilitate searching) | |
| 144 OPENJDK_BUILD_OS="$VAR_OS" | |
| 145 OPENJDK_BUILD_OS_API="$VAR_OS_API" | |
| 146 OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV" | |
| 147 OPENJDK_BUILD_CPU="$VAR_CPU" | |
| 148 OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH" | |
| 149 OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS" | |
| 150 OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN" | |
| 151 AC_SUBST(OPENJDK_BUILD_OS) | |
| 152 AC_SUBST(OPENJDK_BUILD_OS_API) | |
| 153 AC_SUBST(OPENJDK_BUILD_CPU) | |
| 154 AC_SUBST(OPENJDK_BUILD_CPU_ARCH) | |
| 155 AC_SUBST(OPENJDK_BUILD_CPU_BITS) | |
| 156 AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN) | |
| 157 | |
| 158 AC_MSG_CHECKING([openjdk-build os-cpu]) | |
| 159 AC_MSG_RESULT([$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU]) | |
| 160 | |
| 161 # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. | |
| 131 PLATFORM_EXTRACT_VARS_FROM_OS($host_os) | 162 PLATFORM_EXTRACT_VARS_FROM_OS($host_os) |
| 132 PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu) | 163 PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu) |
| 133 # ... and setup our own variables. (Do this explicitely to facilitate searching) | 164 # ... and setup our own variables. (Do this explicitely to facilitate searching) |
| 134 OPENJDK_TARGET_OS="$VAR_OS" | 165 OPENJDK_TARGET_OS="$VAR_OS" |
| 135 OPENJDK_TARGET_OS_API="$VAR_OS_API" | 166 OPENJDK_TARGET_OS_API="$VAR_OS_API" |
| 167 OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" | |
| 136 OPENJDK_TARGET_CPU="$VAR_CPU" | 168 OPENJDK_TARGET_CPU="$VAR_CPU" |
| 137 OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH" | 169 OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH" |
| 138 OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS" | 170 OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS" |
| 139 OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN" | 171 OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN" |
| 140 AC_SUBST(OPENJDK_TARGET_OS) | 172 AC_SUBST(OPENJDK_TARGET_OS) |
| 142 AC_SUBST(OPENJDK_TARGET_CPU) | 174 AC_SUBST(OPENJDK_TARGET_CPU) |
| 143 AC_SUBST(OPENJDK_TARGET_CPU_ARCH) | 175 AC_SUBST(OPENJDK_TARGET_CPU_ARCH) |
| 144 AC_SUBST(OPENJDK_TARGET_CPU_BITS) | 176 AC_SUBST(OPENJDK_TARGET_CPU_BITS) |
| 145 AC_SUBST(OPENJDK_TARGET_CPU_ENDIAN) | 177 AC_SUBST(OPENJDK_TARGET_CPU_ENDIAN) |
| 146 | 178 |
| 147 # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. | 179 AC_MSG_CHECKING([openjdk-target os-cpu]) |
| 148 PLATFORM_EXTRACT_VARS_FROM_OS($build_os) | 180 AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU]) |
| 149 PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu) | |
| 150 # ..and setup our own variables. (Do this explicitely to facilitate searching) | |
| 151 OPENJDK_BUILD_OS="$VAR_OS" | |
| 152 OPENJDK_BUILD_OS_API="$VAR_OS_API" | |
| 153 OPENJDK_BUILD_CPU="$VAR_CPU" | |
| 154 OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH" | |
| 155 OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS" | |
| 156 OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN" | |
| 157 AC_SUBST(OPENJDK_BUILD_OS) | |
| 158 AC_SUBST(OPENJDK_BUILD_OS_API) | |
| 159 AC_SUBST(OPENJDK_BUILD_CPU) | |
| 160 AC_SUBST(OPENJDK_BUILD_CPU_ARCH) | |
| 161 AC_SUBST(OPENJDK_BUILD_CPU_BITS) | |
| 162 AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN) | |
| 163 ]) | 181 ]) |
| 164 | 182 |
| 165 # Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour | 183 # Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour |
| 166 # accordingly. Must be done after setting up build and target system, but before | 184 # accordingly. Must be done after setting up build and target system, but before |
| 167 # doing anything else with these values. | 185 # doing anything else with these values. |
| 206 AC_MSG_ERROR([--with-target-bits can only be 32 or 64, you specified $with_target_bits!]) | 224 AC_MSG_ERROR([--with-target-bits can only be 32 or 64, you specified $with_target_bits!]) |
| 207 fi | 225 fi |
| 208 fi | 226 fi |
| 209 AC_SUBST(COMPILE_TYPE) | 227 AC_SUBST(COMPILE_TYPE) |
| 210 | 228 |
| 211 AC_MSG_CHECKING([for compilation type]) | 229 AC_MSG_CHECKING([compilation type]) |
| 212 AC_MSG_RESULT([$COMPILE_TYPE]) | 230 AC_MSG_RESULT([$COMPILE_TYPE]) |
| 213 ]) | 231 ]) |
| 214 | 232 |
| 215 # Setup the legacy variables, for controlling the old makefiles. | 233 # Setup the legacy variables, for controlling the old makefiles. |
| 216 # | 234 # |
| 297 fi | 315 fi |
| 298 AC_SUBST(OPENJDK_TARGET_OS_API_DIR) | 316 AC_SUBST(OPENJDK_TARGET_OS_API_DIR) |
| 299 | 317 |
| 300 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then | 318 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
| 301 A_LP64="LP64:=" | 319 A_LP64="LP64:=" |
| 302 ADD_LP64="-D_LP64=1" | 320 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in |
| 321 # unpack200.exe | |
| 322 if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then | |
| 323 ADD_LP64="-D_LP64=1" | |
| 324 fi | |
| 303 fi | 325 fi |
| 304 AC_SUBST(LP64,$A_LP64) | 326 AC_SUBST(LP64,$A_LP64) |
| 305 | 327 |
| 306 if test "x$COMPILE_TYPE" = "xcross"; then | 328 if test "x$COMPILE_TYPE" = "xcross"; then |
| 307 # FIXME: ... or should this include reduced builds..? | 329 # FIXME: ... or should this include reduced builds..? |
