Fix build with Clang 6.0.
Note it is partially merged from the upstream patches for Linux and GCC 6. https://bugs.openjdk.java.net/browse/JDK-8163032 http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot/rev/e34324d73cd5 http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/9e1264f51bae PR: 225054
This commit is contained in:
parent
0e9a36ad9d
commit
d27e5917f1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=459311
2 changed files with 21 additions and 0 deletions
|
@ -0,0 +1,10 @@
|
|||
--- hotspot/make/bsd/makefiles/gcc.make.orig
|
||||
+++ hotspot/make/bsd/makefiles/gcc.make
|
||||
@@ -112,6 +112,7 @@ ifeq ($(JVM_VARIANT_ZEROSHARK), true)
|
||||
CFLAGS += $(LIBFFI_CFLAGS)
|
||||
CFLAGS += $(LLVM_CFLAGS)
|
||||
endif
|
||||
+CFLAGS += -std=gnu++98
|
||||
CFLAGS += $(VM_PICFLAG)
|
||||
CFLAGS += -fno-rtti
|
||||
CFLAGS += -fno-exceptions
|
11
java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk
Normal file
11
java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- jdk/make/common/Defs-bsd.gmk.orig
|
||||
+++ jdk/make/common/Defs-bsd.gmk
|
||||
@@ -274,7 +274,7 @@ CFLAGS_OPT = $(CC_OPT)
|
||||
CFLAGS_DBG = $(DEBUG_FLAG)
|
||||
CFLAGS_COMMON += $(CFLAGS_REQUIRED)
|
||||
|
||||
-CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
|
||||
+CXXFLAGS_COMMON = -std=gnu++98 $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
|
||||
CXXFLAGS_OPT = $(CC_OPT)
|
||||
CXXFLAGS_DBG = $(DEBUG_FLAG)
|
||||
CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
|
Loading…
Reference in a new issue