aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Ushakov <alexey.ushakov@jetbrains.com>2017-04-05 16:01:49 +0300
committerAlexey Ushakov <alexey.ushakov@jetbrains.com>2017-04-05 16:02:21 +0300
commitedcd7bece4959dd2c5b3b839a64f5a35767c07a2 (patch)
treedfe8b504daacaca56e88dae105a78a0552596c34
parent435f973f98771edfa2126d5e6b6dea9bbf272e86 (diff)
downloadjdk8u_hotspot-jb8u152-b927.1.tar.gz
JRE-297 Support GCC 6 in Linux build environmentjb8u152-b940jb8u152-b939jb8u152-b938jb8u152-b937jb8u152-b936jb8u152-b935.5jb8u152-b935.3jb8u152-b935.2jb8u152-b935.1jb8u152-b935jb8u152-b934jb8u152-b933jb8u152-b932jb8u152-b931jb8u152-b930.2jb8u152-b930.1jb8u152-b930jb8u152-b929jb8u152-b928jb8u152-b927.2jb8u152-b927.1jb8u152-b927jb8u152-b926jb8u152-b924jb8u152-b923jb8u152-b922jb8u152-b915.9jb8u152-b915.7jb8u152-b915.6jb8u152-b915.5jb8u152-b915.4jb8u152-b915.3jb8u152-b915.12jb8u152-b915.11jb8u152-b915.10jb8u152-b915.1jb8u152-b915jb8u152-b914jb8u152-b907jb8u152-b903jb8u152-b890jb8u152-b889jb8u152-b888jb8u152-b887jb8u152-b886jb8u152-b884.5jb8u152-b884.4jb8u152-b884.3jb8u152-b884.2jb8u152-b884.1jb8u152-b884jb8u152-b875jb8u152-b874jb8u152-b873jb8u152-b872jb8u152-b871jb8u152-b870jb8u152-b869jb8u152-b868jb8u152-b867.5jb8u152-b867.4jb8u152-b867.3jb8u152-b867.2jb8u152-b867.1jb8u152-b867jb8u152-b866jb8u152-b865jb8u152-b864jb8u152-b863jb8u152-b862jb8u152-b861jb8u152-b856jb8u152-b855.1jb8u152-b855jb8u152-b854jb8u152-b853jb8u152-b852jb8u152-b851.5jb8u152-b851.4jb8u152-b851.3jb8u152-b851.2jb8u152-b851.1jb8u152-b851jb8u152-b849jb8u152-b848jb8u152-b847jb8u152-b846jb8u152-b845.3jb8u152-b845.2jb8u152-b845.1jb8u152-b845jb8u152-b844jb8u152-b843jb8u152-b842jb8u152-b841jb8u152-b840jb8u152-b839jb8u152-b838jb8u152-b837.5jb8u152-b837.4jb8u152-b837.2jb8u152-b837.1jb8u152-b837jb8u152-b836jb8u152-b835jb8u152-b834jb8u152-b831jb8u152-b830jb8u152-b829.1jb8u152-b829jb8u152-b828jb8u152-b827jb8u152-b826jb8u152-b825jb8u152-b824jb8u152-b823jb8u152-b821jb8u152-b820jb8u152-b819.2jb8u152-b819.1jb8u152-b819jb8u152-b818jb8u152-b817jb8u152-b816
Provided additional flags to compile on GCC 6
-rw-r--r--make/linux/makefiles/adlc.make2
-rw-r--r--make/linux/makefiles/gcc.make7
2 files changed, 7 insertions, 2 deletions
diff --git a/make/linux/makefiles/adlc.make b/make/linux/makefiles/adlc.make
index 8a866917b..4e47232c7 100644
--- a/make/linux/makefiles/adlc.make
+++ b/make/linux/makefiles/adlc.make
@@ -59,7 +59,7 @@ Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED)
INCLUDES += $(Src_Dirs_I:%=-I%)
# set flags for adlc compilation
-CXXFLAGS = $(SYSDEFS) $(INCLUDES)
+CXXFLAGS = $(SYSDEFS) $(INCLUDES) -std=gnu++98
# Force assertions on.
CXXFLAGS += -DASSERT
diff --git a/make/linux/makefiles/gcc.make b/make/linux/makefiles/gcc.make
index 2807ebbc4..06c881f24 100644
--- a/make/linux/makefiles/gcc.make
+++ b/make/linux/makefiles/gcc.make
@@ -218,7 +218,12 @@ ifeq ($(USE_CLANG),)
# Since GCC 5, there are some deprecated declarations warnings. They break compilation
ifeq "$(shell expr \( $(CC_VER_MAJOR) \>= 5 \) )" "1"
- WARNING_FLAGS += -Wno-error=deprecated-declarations
+ WARNING_FLAGS += -Wno-error=deprecated-declarations
+ endif
+
+ # GCC 6 compilation fix
+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \>= 6 \) )" "1"
+ WARNING_FLAGS += -std=gnu++98
endif
endif