- fix pax patch

[packages/binutils.git] / binutils-pt_pax_flags.patch

diff --git a/binutils-pt_pax_flags.patch b/binutils-pt_pax_flags.patch
index 7708923a1512ebce148ba6ef5ed0abd671bed796..0ac4e38e52e38cc704f097604838f61bee0c6b73 100644 (file)
--- a/binutils-pt_pax_flags.patch
+++ b/binutils-pt_pax_flags.patch
@@ -159,9 +159,9 @@
 --- binutils-2.15.94.0.2.2.orig/include/elf/common.h   2004-11-22 21:33:32.000000000 +0100
 +++ binutils-2.15.94.0.2.2/include/elf/common.h        2005-02-20 13:13:17.482539960 +0100
 @@ -423,6 +423,7 @@
+ #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
  #define PT_GNU_STACK  (PT_LOOS + 0x474e551) /* Stack flags */
  #define PT_GNU_RELRO  (PT_LOOS + 0x474e552) /* Read-only after relocation */
- #define PT_GNU_SHR    (PT_LOOS + 0x474e554) /* Sharable segment */
 +#define PT_PAX_FLAGS   (PT_LOOS + 0x5041580) /* PaX flags */
  
  /* Program segment permissions, in program header p_flags field.  */
@@ -205,22 +205,23 @@
  EOF
  
    if test -n "$COMMONPAGESIZE"; then
---- a/ld/lexsup.c~     2015-05-18 19:03:26.000000000 +0200
-+++ b/ld/lexsup.c      2015-05-19 11:41:03.720941239 +0200
-@@ -1739,10 +1739,14 @@ elf_static_list_options (FILE *file)
+@@ -2220,6 +2230,8 @@
    fprintf (file, _("\
    -z defs                     Report unresolved symbols in object files.\n"));
    fprintf (file, _("\
 +  -z execheap                 Mark executable as requiring executable heap\n"));
 +  fprintf (file, _("\
-   -z muldefs                  Allow multiple definitions\n"));
-   fprintf (file, _("\
    -z execstack                Mark executable as requiring executable stack\n"));
    fprintf (file, _("\
+   -z initfirst                Mark DSO to be initialized first at runtime\n"));
+@@ -2244,6 +2256,8 @@
+   fprintf (file, _("\
+   -z nodump                   Mark DSO not available to dldump\n"));
+   fprintf (file, _("\
 +  -z noexecheap               Mark executable as not requiring executable heap\n"));
 +  fprintf (file, _("\
    -z noexecstack              Mark executable as not requiring executable stack\n"));
- }
+ EOF
  
 --- binutils-2.15.94.0.2.2.orig/ld/ldgram.y    2004-11-22 21:33:32.000000000 +0100
 +++ binutils-2.15.94.0.2.2/ld/ldgram.y 2005-02-20 13:13:17.499537376 +0100