changeset 33165:70cb797f334d

8138820: JDK Hotspot build fails with Xcode 7.0.1 Reviewed-by: iveresov
author twisti
date Fri, 09 Oct 2015 09:09:05 -1000
parents 943f132e809a
children 6437daa39853
files hotspot/make/bsd/makefiles/gcc.make
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/make/bsd/makefiles/gcc.make	Fri Oct 09 15:00:17 2015 +0200
+++ b/hotspot/make/bsd/makefiles/gcc.make	Fri Oct 09 09:09:05 2015 -1000
@@ -314,10 +314,11 @@
 
 # Work around some compiler bugs.
 ifeq ($(USE_CLANG), true)
-  # Clang <= 6.1
+  # Clang < 6 | <= 6.1 | <= 7.0
   ifeq ($(shell expr \
       $(CC_VER_MAJOR) \< 6 \| \
-      \( $(CC_VER_MAJOR) = 6 \& $(CC_VER_MINOR) \<= 1 \) \
+      \( $(CC_VER_MAJOR) = 6 \& $(CC_VER_MINOR) \<= 1 \) \| \
+      \( $(CC_VER_MAJOR) = 7 \& $(CC_VER_MINOR) \<= 0 \) \
     ), 1)
     OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
     OPT_CFLAGS/unsafe.o += -O1