Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8138820: JDK Hotspot build fails with Xcode 7.0.1
authortwisti
Fri, 09 Oct 2015 09:09:05 -1000
changeset 33165 70cb797f334d
parent 33164 943f132e809a
child 33167 6437daa39853
8138820: JDK Hotspot build fails with Xcode 7.0.1 Reviewed-by: iveresov
hotspot/make/bsd/makefiles/gcc.make file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox