diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-01-18 01:58:19 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-01-18 01:58:19 +0000 |
| commit | d27e5917f1838b9f531381b5a376701b466c9a80 (patch) | |
| tree | 229aa4815c502eee62a060651d104aebc85ad3a2 /java/openjdk7 | |
| parent | net/boinc-client: remove 2 lines from previous commit that I intended to delete. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=459311
Diffstat (limited to 'java/openjdk7')
| -rw-r--r-- | java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make | 10 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make b/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make new file mode 100644 index 000000000000..b91c7f244b85 --- /dev/null +++ b/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make @@ -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 diff --git a/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk b/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk new file mode 100644 index 000000000000..ef4d74bd59aa --- /dev/null +++ b/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk @@ -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) |