Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add check for OPENJDK_TARGET_CPU_BITS back into configure #459

Merged
merged 1 commit into from
Nov 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/autoconf/generated-configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4410,7 +4410,7 @@ VS_SDK_PLATFORM_NAME_2017=
#CUSTOM_AUTOCONF_INCLUDE

# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1605236068
DATE_WHEN_GENERATED=1605496318

###############################################################################
#
Expand Down
2 changes: 1 addition & 1 deletion jdk/make/closed/autoconf/custom-hook.m4
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
fi
OPENJ9_BUILD_MODE_ARCH="${OPENJ9_CPU}_mxdptrs"
OPENJ9_LIBS_SUBDIR=default
elif test "x$with_noncompressedrefs" = xyes ; then
elif test "x$with_noncompressedrefs" = xyes -o "x$OPENJDK_TARGET_CPU_BITS" = x32; then
OPENJ9_BUILD_MODE_ARCH="${OPENJ9_CPU}"
OPENJ9_LIBS_SUBDIR=default
else
Expand Down
4 changes: 2 additions & 2 deletions jdk/make/closed/autoconf/generated-configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4550,7 +4550,7 @@ VS_SDK_PLATFORM_NAME_2017=


# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1605236068
DATE_WHEN_GENERATED=1605496318

###############################################################################
#
Expand Down Expand Up @@ -15235,7 +15235,7 @@ fi
fi
OPENJ9_BUILD_MODE_ARCH="${OPENJ9_CPU}_mxdptrs"
OPENJ9_LIBS_SUBDIR=default
elif test "x$with_noncompressedrefs" = xyes ; then
elif test "x$with_noncompressedrefs" = xyes -o "x$OPENJDK_TARGET_CPU_BITS" = x32; then
OPENJ9_BUILD_MODE_ARCH="${OPENJ9_CPU}"
OPENJ9_LIBS_SUBDIR=default
else
Expand Down