X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=binutils-pt_pax_flags.patch;h=7d520f4410b806dc6d136d9e4bb075808cb73aab;hb=31c9854160d5a4525f1d5948241a3cfc64164b9d;hp=e3c203d4bc9cfde274ef965eeb7ffc1818d3406f;hpb=d903addc926abbd3bf960a92293f34d65abcc334;p=packages%2Fbinutils.git diff --git a/binutils-pt_pax_flags.patch b/binutils-pt_pax_flags.patch index e3c203d..7d520f4 100644 --- a/binutils-pt_pax_flags.patch +++ b/binutils-pt_pax_flags.patch @@ -10,9 +10,9 @@ /* Symbol version definitions in external objects. */ Elf_Internal_Verdef *verdef; ---- binutils-2.17.50.0.3/bfd/elf.c.orig 2006-07-15 20:23:49.000000000 +0200 -+++ binutils-2.17.50.0.3/bfd/elf.c 2006-07-17 10:47:54.374440000 +0200 -@@ -1101,6 +1101,7 @@ +--- binutils-2.17.50.0.18/bfd/elf.c.orig 2007-08-01 11:12:02.000000000 -0400 ++++ binutils-2.17.50.0.18/bfd/elf.c 2007-08-01 14:27:36.086986774 -0400 +@@ -1085,6 +1085,7 @@ case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break; case PT_GNU_STACK: pt = "STACK"; break; case PT_GNU_RELRO: pt = "RELRO"; break; @@ -20,17 +20,17 @@ default: pt = NULL; break; } return pt; -@@ -2662,6 +2663,9 @@ +@@ -2346,6 +2347,9 @@ case PT_GNU_RELRO: - return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro"); + return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro"); + case PT_PAX_FLAGS: -+ return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "pax_flags"); ++ return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags"); + default: /* Check for any processor-specific program segment types. */ bed = get_elf_backend_data (abfd); -@@ -3633,6 +3637,11 @@ +@@ -3326,6 +3330,11 @@ ++segs; } @@ -42,7 +42,7 @@ for (s = abfd->sections; s != NULL; s = s->next) { if ((s->flags & SEC_LOAD) != 0 -@@ -4116,6 +4125,20 @@ +@@ -3945,6 +3954,20 @@ pm = &m->next; } @@ -63,19 +63,19 @@ free (sections); elf_tdata (abfd)->segment_map = mfirst; } -@@ -5228,7 +5251,8 @@ +@@ -5129,7 +5152,8 @@ 5. PT_GNU_STACK segments do not include any sections. 6. PT_TLS segment includes only SHF_TLS sections. 7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments. - 8. PT_DYNAMIC should not contain empty sections at the beginning + 8. PT_PAX_FLAGS segments do not include any sections. + 9. PT_DYNAMIC should not contain empty sections at the beginning - (with the possible exception of .dynamic). */ - #define INCLUDE_SECTION_IN_SEGMENT(section, segment, bed) \ + (with the possible exception of .dynamic). */ + #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \ ((((segment->p_paddr \ -@@ -5238,6 +5262,7 @@ +@@ -5138,6 +5162,7 @@ + && (section->flags & SEC_ALLOC) != 0) \ || IS_COREFILE_NOTE (segment, section)) \ - && section->output_section != NULL \ && segment->p_type != PT_GNU_STACK \ + && segment->p_type != PT_PAX_FLAGS \ && (segment->p_type != PT_TLS \ @@ -158,37 +158,37 @@ --- 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 -@@ -307,12 +307,27 @@ +@@ -423,6 +423,7 @@ #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 */ ++#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */ /* Program segment permissions, in program header p_flags field. */ - #define PF_X (1 << 0) /* Segment is executable */ - #define PF_W (1 << 1) /* Segment is writable */ - #define PF_R (1 << 2) /* Segment is readable */ -+ -+#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */ -+#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */ -+#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */ -+#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */ -+#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */ -+#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */ -+#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */ -+#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */ -+#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */ -+#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */ -+#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */ -+#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */ -+ - /* #define PF_MASKOS 0x0F000000 *//* OS-specific reserved bits */ +@@ -433,6 +434,19 @@ #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */ #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */ ---- binutils-2.15.94.0.2.2.orig/ld/emultempl/elf32.em 2004-11-22 21:33:33.000000000 +0100 -+++ binutils-2.15.94.0.2.2/ld/emultempl/elf32.em 2005-02-20 13:13:17.492538440 +0100 -@@ -1859,6 +1859,16 @@ + ++#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */ ++#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */ ++#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */ ++#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */ ++#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */ ++#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */ ++#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */ ++#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */ ++#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */ ++#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */ ++#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */ ++#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */ ++ + /* Values for section header, sh_type field. */ + + #define SHT_NULL 0 /* Section header table entry unused */ +--- binutils-2.18.50.0.1/ld/emultempl/elf32.em.orig 2007-09-08 19:34:12.000000000 +0200 ++++ binutils-2.18.50.0.1/ld/emultempl/elf32.em 2007-09-15 21:41:35.688212063 +0200 +@@ -2139,6 +2139,16 @@ link_info.noexecstack = TRUE; link_info.execstack = FALSE; } @@ -205,20 +205,22 @@ EOF if test -n "$COMMONPAGESIZE"; then -@@ -1925,6 +1935,7 @@ - fprintf (file, _(" -z combreloc\t\tMerge dynamic relocs into one section and sort\n")); - fprintf (file, _(" -z defs\t\tReport unresolved symbols in object files.\n")); - fprintf (file, _(" -z execstack\t\tMark executable as requiring executable stack\n")); -+ fprintf (file, _(" -z execheap\t\tMark executable as requiring executable heap\n")); - fprintf (file, _(" -z initfirst\t\tMark DSO to be initialized first at runtime\n")); - fprintf (file, _(" -z interpose\t\tMark object to interpose all DSOs but executable\n")); - fprintf (file, _(" -z lazy\t\tMark object lazy runtime binding (default)\n")); -@@ -1936,6 +1947,7 @@ - fprintf (file, _(" -z nodelete\t\tMark DSO non-deletable at runtime\n")); - fprintf (file, _(" -z nodlopen\t\tMark DSO not available to dlopen\n")); - fprintf (file, _(" -z nodump\t\tMark DSO not available to dldump\n")); -+ fprintf (file, _(" -z noexecheap\tMark executable as not requiring executable heap\n")); - fprintf (file, _(" -z noexecstack\tMark executable as not requiring executable stack\n")); +@@ -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 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