From 809efe54ca3fbacab7bc2e0432af9cd6474a1267 Mon Sep 17 00:00:00 2001 From: Joe Dekoning Date: Fri, 6 Oct 2017 10:12:48 -0400 Subject: [PATCH] Add OSX support Fixes eclipse/openj9/36 Signed-off-by: Joe Dekoning --- closed/OpenJ9.gmk | 2 +- closed/autoconf/custom-hook.m4 | 3 +++ closed/autoconf/generated-configure.sh | 5 ++++- common/autoconf/generated-configure.sh | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk index b68f9992ed..ebc4ff1729 100755 --- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk @@ -202,7 +202,7 @@ stage-j9 : \ $(call openj9_copy_tree,$(OUTPUT_ROOT)/vm/omr,$(OPENJ9OMR_TOPDIR)) OPENJ9_VERSION_VARS := \ - COMPILER_VERSION_STRING \ + #COMPILER_VERSION_STRING \ HOTSPOT_TARGET_OS \ OPENJDK_TARGET_CPU_BITS \ OPENJDK_TARGET_CPU_OSARCH \ diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4 index 799b55ee7b..7848049c51 100644 --- a/closed/autoconf/custom-hook.m4 +++ b/closed/autoconf/custom-hook.m4 @@ -138,6 +138,9 @@ AC_DEFUN_ONCE([OPENJ9_PLATFORM_SETUP], elif test "x$OPENJDK_BUILD_OS" = xwindows; then OPENJ9_PLATFORM_CODE=wa64 OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs" + elif test "x$OPENJDK_BUILD_OS" = xmacosx; then + OPENJ9_PLATFORM_CODE=xa64 + OPENJ9_BUILDSPEC="osx_x86-64" else AC_MSG_ERROR([Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!]) fi diff --git a/closed/autoconf/generated-configure.sh b/closed/autoconf/generated-configure.sh index 74bf19b1a3..76e26a1296 100644 --- a/closed/autoconf/generated-configure.sh +++ b/closed/autoconf/generated-configure.sh @@ -5245,7 +5245,7 @@ VS_SDK_PLATFORM_NAME_2013= # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1506706543 +DATE_WHEN_GENERATED=1507299140 ############################################################################### # @@ -17133,6 +17133,9 @@ $as_echo "$as_me: Unknown variant(s) specified: $INVALID_VARIANTS" >&6;} elif test "x$OPENJDK_BUILD_OS" = xwindows; then OPENJ9_PLATFORM_CODE=wa64 OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs" + elif test "x$OPENJDK_BUILD_OS" = xmacosx; then + OPENJ9_PLATFORM_CODE=xa64 + OPENJ9_BUILDSPEC="osx_x86-64" else as_fn_error $? "Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!" "$LINENO" 5 fi diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 19cb8efee7..6de10e08eb 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -5186,7 +5186,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1506706543 +DATE_WHEN_GENERATED=1507299140 ############################################################################### #