Merge

Wed, 07 Feb 2018 13:56:06 -0800

author
asaha
date
Wed, 07 Feb 2018 13:56:06 -0800
changeset 2251
77c80807a14c
parent 2247
8b0cb4829e01
parent 2250
6b0ed08eb078
child 2252
2e8ad76d7159

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Feb 07 13:41:14 2018 -0800
     1.2 +++ b/.hgtags	Wed Feb 07 13:56:06 2018 -0800
     1.3 @@ -822,6 +822,8 @@
     1.4  173b2b978c05e59aa471e82be9013955ebd6b4de jdk8u162-b12
     1.5  a127ef57877d806f0840ccd6e7a2be337692fe6e jdk8u162-b31
     1.6  2c309abde14fbef07fe07304f493f770da0f5564 jdk8u162-b32
     1.7 +f8f11c61855441c2d2ec1f87ba76e379fb371cd5 jdk8u162-b33
     1.8 +a916a62cdb9cbdd7fd6ef5fa2e69092454f4fbab jdk8u162-b34
     1.9  d66f57333c7fcc735f87eb0903ffdc0aaf899b32 jdk8u171-b00
    1.10  6e7e84f6107b55b5cb98f5ac5e3bffa3e4b8892f jdk8u171-b01
    1.11  28f638905f78913e5b6dc89dd88e37223984a105 jdk8u171-b02
     2.1 --- a/common/autoconf/generated-configure.sh	Wed Feb 07 13:41:14 2018 -0800
     2.2 +++ b/common/autoconf/generated-configure.sh	Wed Feb 07 13:56:06 2018 -0800
     2.3 @@ -3776,7 +3776,7 @@
     2.4  
     2.5  
     2.6  #
     2.7 -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
     2.8 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     2.9  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2.10  #
    2.11  # This code is free software; you can redistribute it and/or modify it
    2.12 @@ -3912,7 +3912,7 @@
    2.13  #CUSTOM_AUTOCONF_INCLUDE
    2.14  
    2.15  # Do not change or remove the following line, it is needed for consistency checks:
    2.16 -DATE_WHEN_GENERATED=1501170108
    2.17 +DATE_WHEN_GENERATED=1517507181
    2.18  
    2.19  ###############################################################################
    2.20  #
    2.21 @@ -30178,9 +30178,10 @@
    2.22          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
    2.23        fi
    2.24        if test "x$OPENJDK_TARGET_OS" = xlinux; then
    2.25 -        # And since we now know that the linker is gnu, then add -z defs, to forbid
    2.26 -        # undefined symbols in object files.
    2.27 -        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
    2.28 +        # And since we now know that the linker is gnu, then add:
    2.29 +        #   -z defs, to forbid undefined symbols in object files
    2.30 +        #   -z noexecstack, to mark stack regions as non-executable
    2.31 +        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs -Xlinker -z -Xlinker noexecstack"
    2.32          if test "x$DEBUG_LEVEL" = "xrelease"; then
    2.33            # When building release libraries, tell the linker optimize them.
    2.34            # Should this be supplied to the OSS linker as well?
     3.1 --- a/common/autoconf/toolchain.m4	Wed Feb 07 13:41:14 2018 -0800
     3.2 +++ b/common/autoconf/toolchain.m4	Wed Feb 07 13:56:06 2018 -0800
     3.3 @@ -1,5 +1,5 @@
     3.4  #
     3.5 -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
     3.6 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     3.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8  #
     3.9  # This code is free software; you can redistribute it and/or modify it
    3.10 @@ -1211,9 +1211,10 @@
    3.11          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
    3.12        fi
    3.13        if test "x$OPENJDK_TARGET_OS" = xlinux; then
    3.14 -        # And since we now know that the linker is gnu, then add -z defs, to forbid
    3.15 -        # undefined symbols in object files.
    3.16 -        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
    3.17 +        # And since we now know that the linker is gnu, then add:
    3.18 +        #   -z defs, to forbid undefined symbols in object files
    3.19 +        #   -z noexecstack, to mark stack regions as non-executable
    3.20 +        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs -Xlinker -z -Xlinker noexecstack"
    3.21          if test "x$DEBUG_LEVEL" = "xrelease"; then
    3.22            # When building release libraries, tell the linker optimize them.
    3.23            # Should this be supplied to the OSS linker as well?

mercurial