Merge pull request #3215 from jdekonin/master

Add OSX settings for PR builds

buildenv/jenkins/variables/defaults.yml

@@ -354,3 +354,22 @@ win_x86:
       8: 'hw.arch.x86 && sw.os.windows'
     test:
       8: 'hw.arch.x86 && sw.os.windows'
+#========================================#
+# OSX x86 64bits Compressed Pointers
+#========================================#
+osx_x86-64_cmprssptrs:
+  boot_jdk:
+    8: '/Users/jenkins/bootjdks/openjdk-java-7'
+    11: '/Users/jenkins/bootjdks/adoptojdk-java-10'
+  release:
+    8: 'osx-x86_64-normal-server-release'
+    11: 'macosx-x86_64-normal-server-release'
+  freemarker: '/Users/jenkins/freemarker.jar'
+  openjdk_reference_repo: '/Users/jenkins/openjdk_cache'
+  node_labels:
+    build:
+      8: 'hw.arch.x86 && sw.os.osx'
+      11: 'hw.arch.x86 && sw.os.osx'
+    test:
+      8: 'hw.arch.x86 && sw.os.osx'
+      11: 'hw.arch.x86 && sw.os.osx'

runtime/compiler/makefile.ftl

@@ -87,6 +87,13 @@ export BUILD_CONFIG?=prod
 <#elseif uma.spec.id?starts_with("linux_arm_linaro")>
   export PLATFORM=arm-linux-gcc-cross
 </#if>
+<#if uma.spec.id?starts_with("osx_x86-64")>
+  ifeq ($(VERSION_MAJOR),8)
+    export PLATFORM=amd64-osx-gcc
+  else
+    export PLATFORM=amd64-osx-clang
+  endif
+</#if>
 
 <#if uma.spec.flags.uma_codeCoverage.enabled>
 export FE_CFLAGS+=-fprofile-arcs -ftest-coverage