From 0fcb1de5ace2b6509ec21997cc5a57d653bc79cb Mon Sep 17 00:00:00 2001 From: OpenJDK Team Date: Wed, 16 Oct 2024 10:41:47 +0200 Subject: [PATCH] machine-flag Gbp-Pq: Name machine-flag.diff --- make/autoconf/flags.m4 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4 index 7060edeff..fc9375602 100644 --- a/make/autoconf/flags.m4 +++ b/make/autoconf/flags.m4 @@ -276,6 +276,7 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN], test "x$OPENJDK_TARGET_CPU_ARCH" = xppc; then MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" fi + case "$host" in *x32) MACHINE_FLAG=;; esac fi if test "x$OPENJDK_TARGET_OS" = xmacosx; then @@ -358,11 +359,8 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL], AC_SUBST(COMPILER_COMMAND_FILE_FLAG) AC_SUBST(COMPILER_BINDCMD_FILE_FLAG) - # Check that the compiler supports -mX (or -qX on AIX) flags - # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does - FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}], - IF_TRUE: [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true], - IF_FALSE: [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false]) + # Don't run the -mX check and set this always to false, or else x32 gets passed -m32 + COMPILER_SUPPORTS_TARGET_BITS_FLAG=false AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG) if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then -- 2.30.2