371
372 # Setup OPENJDK_$1_CPU_OSARCH, which is used to set the os.arch Java system property
373 OPENJDK_$1_CPU_OSARCH="$OPENJDK_$1_CPU"
374 if test "x$OPENJDK_$1_OS" = xlinux && test "x$OPENJDK_$1_CPU" = xx86; then
375 # On linux only, we replace x86 with i386.
376 OPENJDK_$1_CPU_OSARCH="i386"
377 elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then
378 # On all platforms except macosx, we replace x86_64 with amd64.
379 OPENJDK_$1_CPU_OSARCH="amd64"
380 fi
381 AC_SUBST(OPENJDK_$1_CPU_OSARCH)
382
383 OPENJDK_$1_CPU_JLI="$OPENJDK_$1_CPU"
384 if test "x$OPENJDK_$1_CPU" = xx86; then
385 OPENJDK_$1_CPU_JLI="i386"
386 elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then
387 # On all platforms except macosx, we replace x86_64 with amd64.
388 OPENJDK_$1_CPU_JLI="amd64"
389 fi
390
391 if test "x$OPENJDK_$1_OS" = xmacosx; then
392 OPENJDK_$1_OS_EXPORT_DIR=macosx
393 else
394 OPENJDK_$1_OS_EXPORT_DIR=${OPENJDK_$1_OS_TYPE}
395 fi
396 AC_SUBST(OPENJDK_$1_OS_EXPORT_DIR)
397
398 # The new version string in JDK 9 also defined new naming of OS and ARCH for bundles
399 # Macosx is osx and x86_64 is x64
400 if test "x$OPENJDK_$1_OS" = xmacosx; then
401 OPENJDK_$1_OS_BUNDLE="osx"
402 else
403 OPENJDK_$1_OS_BUNDLE="$OPENJDK_TARGET_OS"
404 fi
405 if test "x$OPENJDK_$1_CPU" = xx86_64; then
406 OPENJDK_$1_CPU_BUNDLE="x64"
407 else
408 OPENJDK_$1_CPU_BUNDLE="$OPENJDK_$1_CPU"
409 fi
410 OPENJDK_$1_BUNDLE_PLATFORM="${OPENJDK_$1_OS_BUNDLE}-${OPENJDK_$1_CPU_BUNDLE}"
411 AC_SUBST(OPENJDK_$1_BUNDLE_PLATFORM)
412
413 if test "x$OPENJDK_$1_CPU_BITS" = x64; then
414 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
415 # unpack200.exe. This variable is used in
416 # FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER.
417 if test "x$OPENJDK_$1_OS" = xlinux || test "x$OPENJDK_$1_OS" = xmacosx; then
|
371
372 # Setup OPENJDK_$1_CPU_OSARCH, which is used to set the os.arch Java system property
373 OPENJDK_$1_CPU_OSARCH="$OPENJDK_$1_CPU"
374 if test "x$OPENJDK_$1_OS" = xlinux && test "x$OPENJDK_$1_CPU" = xx86; then
375 # On linux only, we replace x86 with i386.
376 OPENJDK_$1_CPU_OSARCH="i386"
377 elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then
378 # On all platforms except macosx, we replace x86_64 with amd64.
379 OPENJDK_$1_CPU_OSARCH="amd64"
380 fi
381 AC_SUBST(OPENJDK_$1_CPU_OSARCH)
382
383 OPENJDK_$1_CPU_JLI="$OPENJDK_$1_CPU"
384 if test "x$OPENJDK_$1_CPU" = xx86; then
385 OPENJDK_$1_CPU_JLI="i386"
386 elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then
387 # On all platforms except macosx, we replace x86_64 with amd64.
388 OPENJDK_$1_CPU_JLI="amd64"
389 fi
390
391 # The new version string in JDK 9 also defined new naming of OS and ARCH for bundles
392 # Macosx is osx and x86_64 is x64
393 if test "x$OPENJDK_$1_OS" = xmacosx; then
394 OPENJDK_$1_OS_BUNDLE="osx"
395 else
396 OPENJDK_$1_OS_BUNDLE="$OPENJDK_TARGET_OS"
397 fi
398 if test "x$OPENJDK_$1_CPU" = xx86_64; then
399 OPENJDK_$1_CPU_BUNDLE="x64"
400 else
401 OPENJDK_$1_CPU_BUNDLE="$OPENJDK_$1_CPU"
402 fi
403 OPENJDK_$1_BUNDLE_PLATFORM="${OPENJDK_$1_OS_BUNDLE}-${OPENJDK_$1_CPU_BUNDLE}"
404 AC_SUBST(OPENJDK_$1_BUNDLE_PLATFORM)
405
406 if test "x$OPENJDK_$1_CPU_BITS" = x64; then
407 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
408 # unpack200.exe. This variable is used in
409 # FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER.
410 if test "x$OPENJDK_$1_OS" = xlinux || test "x$OPENJDK_$1_OS" = xmacosx; then
|