8203845: backport of JDK-8034788 inadvertently rolled back JDK-8187045 changes to toolchain.m4

Thu, 31 May 2018 03:58:03 -0400

author
dbuck
date
Thu, 31 May 2018 03:58:03 -0400
changeset 2226
d5dd14b37ea5
parent 2225
fe7df3d2f5ae
child 2227
77b81e582939

8203845: backport of JDK-8034788 inadvertently rolled back JDK-8187045 changes to toolchain.m4
Summary: reapply JDK- 8187045 changes to flags.m4
Reviewed-by: tbell, erikj

common/autoconf/flags.m4 file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/flags.m4	Fri May 25 10:37:07 2018 +0100
     1.2 +++ b/common/autoconf/flags.m4	Thu May 31 03:58:03 2018 -0400
     1.3 @@ -640,9 +640,10 @@
     1.4          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
     1.5        fi
     1.6        if test "x$OPENJDK_TARGET_OS" = xlinux; then
     1.7 -        # And since we now know that the linker is gnu, then add -z defs, to forbid
     1.8 -        # undefined symbols in object files.
     1.9 -        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
    1.10 +        # And since we now know that the linker is gnu, then add:
    1.11 +        #   -z defs, to forbid undefined symbols in object files
    1.12 +        #   -z noexecstack, to mark stack regions as non-executable
    1.13 +        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs -Xlinker -z -Xlinker noexecstack"
    1.14          if test "x$DEBUG_LEVEL" = "xrelease"; then
    1.15            # When building release libraries, tell the linker optimize them.
    1.16            # Should this be supplied to the OSS linker as well?
     2.1 --- a/common/autoconf/generated-configure.sh	Fri May 25 10:37:07 2018 +0100
     2.2 +++ b/common/autoconf/generated-configure.sh	Thu May 31 03:58:03 2018 -0400
     2.3 @@ -4305,7 +4305,7 @@
     2.4  #CUSTOM_AUTOCONF_INCLUDE
     2.5  
     2.6  # Do not change or remove the following line, it is needed for consistency checks:
     2.7 -DATE_WHEN_GENERATED=1527191982
     2.8 +DATE_WHEN_GENERATED=1527649790
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -41654,9 +41654,10 @@
    2.13          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
    2.14        fi
    2.15        if test "x$OPENJDK_TARGET_OS" = xlinux; then
    2.16 -        # And since we now know that the linker is gnu, then add -z defs, to forbid
    2.17 -        # undefined symbols in object files.
    2.18 -        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
    2.19 +        # And since we now know that the linker is gnu, then add:
    2.20 +        #   -z defs, to forbid undefined symbols in object files
    2.21 +        #   -z noexecstack, to mark stack regions as non-executable
    2.22 +        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs -Xlinker -z -Xlinker noexecstack"
    2.23          if test "x$DEBUG_LEVEL" = "xrelease"; then
    2.24            # When building release libraries, tell the linker optimize them.
    2.25            # Should this be supplied to the OSS linker as well?

mercurial