kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MFH: r459311

Browse source 
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

Approved by:	ports-secteam (implicit)
This commit is contained in:
Steve Wills 2018-02-23 18:14:59 +00:00
parent f155bc1929
commit 896a6d846c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q1/; revision=462712
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make Normal file
View file

@ -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
View 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)