Mercurial > hg > release > icedtea7-forest-2.6 > hotspot
changeset 6763:13031adeeef5 icedtea-2.6.22 icedtea-2.6.23pre00
Merge jdk7u261-b02
| author | andrew |
|---|---|
| date | Mon, 13 Apr 2020 16:44:26 +0100 |
| parents | 589dc1af9e7b (current diff) 5530d69c4b0c (diff) |
| children | 83361fc516e1 |
| files | .hgtags make/bsd/makefiles/gcc.make make/linux/makefiles/gcc.make make/linux/makefiles/jsig.make make/linux/makefiles/saproc.make make/solaris/makefiles/gcc.make make/solaris/makefiles/jsig.make make/solaris/makefiles/saproc.make |
| diffstat | 10 files changed, 36 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Feb 28 04:05:28 2020 +0000 +++ b/.hgtags Mon Apr 13 16:44:26 2020 +0100 @@ -958,3 +958,7 @@ cea2195191744b01d089f12d0264fc572fb35690 jdk7u251-b01 69946653069110a57f9d49e40a05147c574966ca jdk7u251-b02 d89441a9ce987745a0342b69213758f0fe109976 icedtea-2.6.21 +69946653069110a57f9d49e40a05147c574966ca jdk7u251-ga +69946653069110a57f9d49e40a05147c574966ca jdk7u261-b00 +7c318f4ec806e29e25a386751e55c8e138705734 jdk7u261-b01 +493615a206a94e11c9ff09d58d1733758556ac95 jdk7u261-b02
--- a/make/bsd/makefiles/gcc.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/bsd/makefiles/gcc.make Mon Apr 13 16:44:26 2020 +0100 @@ -278,6 +278,9 @@ # Enable linker optimization LFLAGS += -Xlinker -O1 + # Create a RELRO section for memory segments that should be read-only after relocation + LFLAGS += -Xlinker -z -Xlinker relro + # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj SONAMEFLAG = -Xlinker -soname=SONAME
--- a/make/bsd/makefiles/jsig.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/bsd/makefiles/jsig.make Mon Apr 13 16:44:26 2020 +0100 @@ -49,6 +49,11 @@ LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) +ifneq ($(OS_VENDOR), Darwin) +# Create a RELRO section for memory segments that should be read-only after relocation +LFLAGS_JSIG += -Xlinker -z -Xlinker relro +endif + # DEBUG_BINARIES overrides everything, use full -g debug information ifeq ($(DEBUG_BINARIES), true) JSIG_DEBUG_CFLAGS = -g
--- a/make/bsd/makefiles/saproc.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/bsd/makefiles/saproc.make Mon Apr 13 16:44:26 2020 +0100 @@ -85,6 +85,8 @@ ifneq ($(OS_VENDOR), Darwin) SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) +# Create a RELRO section for memory segments that should be read-only after relocation +SA_LFLAGS += -Xlinker -z -Xlinker relro endif SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
--- a/make/linux/makefiles/gcc.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/linux/makefiles/gcc.make Mon Apr 13 16:44:26 2020 +0100 @@ -238,6 +238,9 @@ endif LFLAGS += $(LDFLAGS_HASH_STYLE) +# Create a RELRO section for memory segments that should be read-only after relocation +LFLAGS += -Xlinker -z -Xlinker relro + # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. MAPFLAG = -Xlinker --version-script=FILENAME
--- a/make/linux/makefiles/jsig.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/linux/makefiles/jsig.make Mon Apr 13 16:44:26 2020 +0100 @@ -51,6 +51,9 @@ LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) +# Create a RELRO section for memory segments that should be read-only after relocation +LFLAGS_JSIG += -Xlinker -z -Xlinker relro + # DEBUG_BINARIES overrides everything, use full -g debug information ifeq ($(DEBUG_BINARIES), true) JSIG_DEBUG_CFLAGS = -g
--- a/make/linux/makefiles/saproc.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/linux/makefiles/saproc.make Mon Apr 13 16:44:26 2020 +0100 @@ -79,6 +79,9 @@ endif SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) +# Create a RELRO section for memory segments that should be read-only after relocation +SA_LFLAGS += -Xlinker -z -Xlinker relro + $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
--- a/make/solaris/makefiles/gcc.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/solaris/makefiles/gcc.make Mon Apr 13 16:44:26 2020 +0100 @@ -173,6 +173,9 @@ # Enable linker optimization LFLAGS += -Xlinker -O1 +# Create a RELRO section for memory segments that should be read-only after relocation +LFLAGS += -Xlinker -z -Xlinker relro + # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. MAPFLAG = -Xlinker --version-script=FILENAME else
--- a/make/solaris/makefiles/jsig.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/solaris/makefiles/jsig.make Mon Apr 13 16:44:26 2020 +0100 @@ -52,6 +52,11 @@ LFLAGS_JSIG += -mt -xnolib endif +ifdef USE_GNULD +# Create a RELRO section for memory segments that should be read-only after relocation +LFLAGS_JSIG += -Xlinker -z -Xlinker relro +endif + $(LIBJSIG): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) @echo Making signal interposition lib... $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
--- a/make/solaris/makefiles/saproc.make Fri Feb 28 04:05:28 2020 +0000 +++ b/make/solaris/makefiles/saproc.make Mon Apr 13 16:44:26 2020 +0100 @@ -63,6 +63,11 @@ SA_LFLAGS += -mt -xnolib -norunpath endif +ifdef USE_GNULD +# Create a RELRO section for memory segments that should be read-only after relocation +SA_LFLAGS += -Xlinker -z -Xlinker relro +endif + # The libproc Pstack_iter() interface changed in Nevada-B159. # Use 'uname -r -v' to determine the Solaris version as per # Solaris Nevada team request. This logic needs to match: