36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
|
diff --git openjdk.orig/hotspot/make/bsd/makefiles/gcc.make openjdk/hotspot/make/bsd/makefiles/gcc.make
|
||
|
|
--- openjdk.orig/hotspot/make/bsd/makefiles/gcc.make
|
||
|
|
+++ openjdk/hotspot/make/bsd/makefiles/gcc.make
|
||
|
|
@@ -190,7 +190,7 @@
|
||
|
|
CFLAGS += -fno-exceptions
|
||
|
|
ifeq ($(USE_CLANG),)
|
||
|
|
CFLAGS += -pthread
|
||
|
|
- CFLAGS += -fcheck-new -fstack-protector
|
||
|
|
+ CFLAGS += -fcheck-new
|
||
|
|
# version 4 and above support fvisibility=hidden (matches jni_x86.h file)
|
||
|
|
# except 4.1.2 gives pointless warnings that can't be disabled (afaik)
|
||
|
|
ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
|
||
|
|
diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
|
||
|
|
--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
|
||
|
|
+++ openjdk/hotspot/make/linux/makefiles/gcc.make
|
||
|
|
@@ -150,7 +150,7 @@
|
||
|
|
CFLAGS += -fno-exceptions
|
||
|
|
CFLAGS += -D_REENTRANT
|
||
|
|
ifeq ($(USE_CLANG),)
|
||
|
|
- CFLAGS += -fcheck-new -fstack-protector
|
||
|
|
+ CFLAGS += -fcheck-new
|
||
|
|
# version 4 and above support fvisibility=hidden (matches jni_x86.h file)
|
||
|
|
# except 4.1.2 gives pointless warnings that can't be disabled (afaik)
|
||
|
|
ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
|
||
|
|
diff --git openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make
|
||
|
|
--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make
|
||
|
|
+++ openjdk/hotspot/make/solaris/makefiles/gcc.make
|
||
|
|
@@ -75,7 +75,6 @@
|
||
|
|
CFLAGS += -fno-exceptions
|
||
|
|
CFLAGS += -D_REENTRANT
|
||
|
|
CFLAGS += -fcheck-new
|
||
|
|
-CFLAGS += -fstack-protector
|
||
|
|
|
||
|
|
ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
|
||
|
|
|