-- -- @cindex alignment for NEON instructions -- Some NEON load/store instructions allow an optional address -- alignment qualifier. -- The ARM documentation specifies that this is indicated by -- @samp{@@ @var{align}}. However GAS already interprets -- the @samp{@@} character as a "line comment" start, -- so @samp{: @var{align}} is used instead. For example: -- -- @smallexample -- vld1.8 @{q0@}, [r0, :128] -- @end smallexample -- -- @node ARM Floating Point -- @section Floating Point -- -- @cindex floating point, ARM (@sc{ieee}) -- @cindex ARM floating point (@sc{ieee}) -- The ARM family uses @sc{ieee} floating-point numbers. -- - @node ARM-Relocations - @subsection ARM relocation generation - ---- 451,456 ---- -*************** respectively. For example to load the 3 -*** 519,524 **** ---- 497,524 ---- - MOVT r0, #:upper16:foo - @end smallexample - -+ @node ARM-Neon-Alignment -+ @subsection NEON Alignment Specifiers -+ -+ @cindex alignment for NEON instructions -+ Some NEON load/store instructions allow an optional address -+ alignment qualifier. -+ The ARM documentation specifies that this is indicated by -+ @samp{@@ @var{align}}. However GAS already interprets -+ the @samp{@@} character as a "line comment" start, -+ so @samp{: @var{align}} is used instead. For example: -+ -+ @smallexample -+ vld1.8 @{q0@}, [r0, :128] -+ @end smallexample -+ -+ @node ARM Floating Point -+ @section Floating Point -+ -+ @cindex floating point, ARM (@sc{ieee}) -+ @cindex ARM floating point (@sc{ieee}) -+ The ARM family uses @sc{ieee} floating-point numbers. -+ - @node ARM Directives - @section ARM Machine Directives - -diff -cp ../binutils-2.23.52.0.1.orig/gas/doc/c-cr16.texi gas/doc/c-cr16.texi -*** ../binutils-2.23.52.0.1.orig/gas/doc/c-cr16.texi 2013-03-04 08:25:32.086931943 +0000 ---- gas/doc/c-cr16.texi 2013-03-04 08:28:09.304926971 +0000 -*************** Operand expression type qualifier is an -*** 44,69 **** - CR16 target operand qualifiers and its size (in bits): - - @table @samp -! @item Immediate Operand -! - s ---- 4 bits -! @item -! - m ---- 16 bits, for movb and movw instructions. -! @item -! - m ---- 20 bits, movd instructions. -! @item -! - l ---- 32 bits -! -! @item Absolute Operand -! - s ---- Illegal specifier for this operand. -! @item -! - m ---- 20 bits, movd instructions. -! -! @item Displacement Operand -! - s ---- 8 bits -! @item -! - m ---- 16 bits -! @item -! - l ---- 24 bits - @end table - - For example: ---- 44,76 ---- - CR16 target operand qualifiers and its size (in bits): - - @table @samp -! @item Immediate Operand: s -! 4 bits. -! -! @item Immediate Operand: m -! 16 bits, for movb and movw instructions. -! -! @item Immediate Operand: m -! 20 bits, movd instructions. -! -! @item Immediate Operand: l -! 32 bits. -! -! @item Absolute Operand: s -! Illegal specifier for this operand. -! -! @item Absolute Operand: m -! 20 bits, movd instructions. -! -! @item Displacement Operand: s -! 8 bits. -! -! @item Displacement Operand: m -! 16 bits. -! -! @item Displacement Operand: l -! 24 bits. -! - @end table - - For example: -diff -cp ../binutils-2.23.52.0.1.orig/gas/doc/c-tic54x.texi gas/doc/c-tic54x.texi -*** ../binutils-2.23.52.0.1.orig/gas/doc/c-tic54x.texi 2013-03-04 08:25:32.035931945 +0000 ---- gas/doc/c-tic54x.texi 2013-03-04 08:28:38.186926057 +0000 -*************** In this example, x is replaced with SYM2 -*** 109,115 **** - is replaced with x. At this point, x has already been encountered - and the substitution stops. - -! @smallexample @code - .asg "x",SYM1 - .asg "SYM1",SYM2 - .asg "SYM2",x ---- 109,115 ---- - is replaced with x. At this point, x has already been encountered - and the substitution stops. - -! @smallexample - .asg "x",SYM1 - .asg "SYM1",SYM2 - .asg "SYM2",x -*************** Substitution may be forced in situations -*** 126,139 **** - ambiguous by placing colons on either side of the subsym. The following - code: - -! @smallexample @code - .eval "10",x - LAB:X: add #x, a - @end smallexample - - When assembled becomes: - -! @smallexample @code - LAB10 add #10, a - @end smallexample - ---- 126,139 ---- - ambiguous by placing colons on either side of the subsym. The following - code: - -! @smallexample - .eval "10",x - LAB:X: add #x, a - @end smallexample - - When assembled becomes: - -! @smallexample - LAB10 add #10, a - @end smallexample - -*************** The @code{LDX} pseudo-op is provided for -*** 309,315 **** - of a label or address. For example, if an address @code{_label} resides - in extended program memory, the value of @code{_label} may be loaded as - follows: -! @smallexample @code - ldx #_label,16,a ; loads extended bits of _label - or #_label,a ; loads lower 16 bits of _label - bacc a ; full address is in accumulator A ---- 309,315 ---- - of a label or address. For example, if an address @code{_label} resides - in extended program memory, the value of @code{_label} may be loaded as - follows: -! @smallexample - ldx #_label,16,a ; loads extended bits of _label - or #_label,a ; loads lower 16 bits of _label - bacc a ; full address is in accumulator A diff --git a/binutils/patches/binutils-2.23.52.0.1-pt-pax-flags-20130326.patch b/binutils/patches/binutils-2.23.52.0.1-pt-pax-flags-20130326.patch deleted file mode 100644 index b173b2a..0000000 --- a/binutils/patches/binutils-2.23.52.0.1-pt-pax-flags-20130326.patch +++ /dev/null @@ -1,1030 +0,0 @@ ---- binutils-2.23.52.0.1/bfd/elf-bfd.h -+++ binutils-2.23.52.0.1/bfd/elf-bfd.h -@@ -1577,6 +1577,9 @@ struct elf_obj_tdata - /* Segment flags for the PT_GNU_STACK segment. */ - unsigned int stack_flags; - -+ /* Segment flags for the PT_PAX_FLAGS segment. */ -+ unsigned int pax_flags; -+ - /* This is set to TRUE if the object was created by the backend - linker. */ - bfd_boolean linker; -@@ -1707,6 +1707,7 @@ - #define elf_eh_frame_hdr(bfd) (elf_tdata(bfd) -> o->eh_frame_hdr) - #define elf_linker(bfd) (elf_tdata(bfd) -> o->linker) - #define elf_stack_flags(bfd) (elf_tdata(bfd) -> o->stack_flags) -+#define elf_pax_flags(bfd) (elf_tdata(bfd) -> o->pax_flags) - #define elf_shstrtab(bfd) (elf_tdata(bfd) -> o->strtab_ptr) - #define elf_onesymtab(bfd) (elf_tdata(bfd) -> symtab_section) - #define elf_symtab_shndx(bfd) (elf_tdata(bfd) -> symtab_shndx_section) ---- binutils-2.23.52.0.1/bfd/elf.c -+++ binutils-2.23.52.0.1/bfd/elf.c -@@ -1158,6 +1158,7 @@ get_segment_type (unsigned int p_type) - case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break; - case PT_GNU_STACK: pt = "STACK"; break; - case PT_GNU_RELRO: pt = "RELRO"; break; -+ case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break; - default: pt = NULL; break; - } - return pt; -@@ -2477,6 +2478,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index) - case PT_GNU_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, hdr_index, "pax_flags"); -+ - default: - /* Check for any processor-specific program segment types. */ - bed = get_elf_backend_data (abfd); -@@ -3551,6 +3555,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info) - ++segs; - } - -+ { -+ /* We need a PT_PAX_FLAGS segment. */ -+ ++segs; -+ } -+ - for (s = abfd->sections; s != NULL; s = s->next) - { - if ((s->flags & SEC_LOAD) != 0 -@@ -4153,6 +4162,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info) - } - } - -+ { -+ amt = sizeof (struct elf_segment_map); -+ m = bfd_zalloc (abfd, amt); -+ if (m == NULL) -+ goto error_return; -+ m->next = NULL; -+ m->p_type = PT_PAX_FLAGS; -+ m->p_flags = elf_pax_flags (abfd); -+ m->p_flags_valid = 1; -+ -+ *pm = m; -+ pm = &m->next; -+ } -+ - free (sections); - elf_tdata (abfd)->segment_map = mfirst; - } -@@ -5417,7 +5440,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) - 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 -- (with the possible exception of .dynamic). */ -+ (with the possible exception of .dynamic). -+ 9. PT_PAX_FLAGS segments do not include any sections. */ - #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \ - ((((segment->p_paddr \ - ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr) \ -@@ -5425,6 +5449,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) - && (section->flags & SEC_ALLOC) != 0) \ - || IS_NOTE (segment, section)) \ - && segment->p_type != PT_GNU_STACK \ -+ && segment->p_type != PT_PAX_FLAGS \ - && (segment->p_type != PT_TLS \ - || (section->flags & SEC_THREAD_LOCAL)) \ - && (segment->p_type == PT_LOAD \ ---- binutils-2.23.52.0.1/bfd/elflink.c -+++ binutils-2.23.52.0.1/bfd/elflink.c -@@ -5545,17 +5545,30 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, - && ! (*bed->elf_backend_always_size_sections) (output_bfd, info)) - return FALSE; - -+ elf_pax_flags (output_bfd) = PF_NORANDEXEC; -+ if (info->execheap) -+ elf_pax_flags (output_bfd) |= PF_NOMPROTECT; -+ else if (info->noexecheap) -+ elf_pax_flags (output_bfd) |= PF_MPROTECT; -+ - /* Determine any GNU_STACK segment requirements, after the backend - has had a chance to set a default segment size. */ - if (info->execstack) -- elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X; -+ { -+ elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X; -+ elf_pax_flags (output_bfd) |= PF_EMUTRAMP; -+ } - else if (info->noexecstack) -- elf_stack_flags (output_bfd) = PF_R | PF_W; -+ { -+ elf_stack_flags (output_bfd) = PF_R | PF_W; -+ elf_pax_flags (output_bfd) |= PF_NOEMUTRAMP; -+ } - else - { - bfd *inputobj; - asection *notesec = NULL; - int exec = 0; - -+ elf_pax_flags (output_bfd) |= PF_NOEMUTRAMP; - for (inputobj = info->input_bfds; - inputobj; - inputobj = inputobj->link_next) -@@ -5567,7 +5581,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, - if (s) - { - if (s->flags & SEC_CODE) -- exec = PF_X; -+ { -+ elf_pax_flags (output_bfd) &= ~PF_NOEMUTRAMP; -+ elf_pax_flags (output_bfd) |= PF_EMUTRAMP; -+ exec = PF_X; -+ } - notesec = s; - } - else if (bed->default_execstack) ---- binutils-2.23.52.0.1/binutils/readelf.c -+++ binutils-2.23.52.0.1/binutils/readelf.c -@@ -2740,6 +2740,7 @@ get_segment_type (unsigned long p_type) - return "GNU_EH_FRAME"; - case PT_GNU_STACK: return "GNU_STACK"; - case PT_GNU_RELRO: return "GNU_RELRO"; -+ case PT_PAX_FLAGS: return "PAX_FLAGS"; - - default: - if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) ---- binutils-2.23.52.0.1/include/bfdlink.h -+++ binutils-2.23.52.0.1/include/bfdlink.h -@@ -322,6 +322,14 @@ struct bfd_link_info - /* TRUE if PT_GNU_RELRO segment should be created. */ - unsigned int relro: 1; - -+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT -+ flags. */ -+ unsigned int execheap: 1; -+ -+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT -+ flags. */ -+ unsigned int noexecheap: 1; -+ - /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment - should be created. */ - unsigned int eh_frame_hdr: 1; ---- binutils-2.23.52.0.1/include/elf/common.h -+++ binutils-2.23.52.0.1/include/elf/common.h -@@ -429,6 +429,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_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */ - #define PT_GNU_SHR (PT_LOOS + 0x474e554) /* Sharable segment */ - - /* Program segment permissions, in program header p_flags field. */ -@@ -439,6 +440,21 @@ - #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */ - #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */ - -+/* Flags to control PaX behavior. */ -+ -+#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.23.52.0.1/ld/emultempl/elf32.em -+++ binutils-2.23.52.0.1/ld/emultempl/elf32.em -@@ -2285,6 +2285,16 @@ fragment <<EOF - link_info.noexecstack = TRUE; - link_info.execstack = FALSE; - } -+ else if (strcmp (optarg, "execheap") == 0) -+ { -+ link_info.execheap = TRUE; -+ link_info.noexecheap = FALSE; -+ } -+ else if (strcmp (optarg, "noexecheap") == 0) -+ { -+ link_info.noexecheap = TRUE; -+ link_info.execheap = FALSE; -+ } - EOF - if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then - fragment <<EOF -@@ -2368,6 +2378,8 @@ fragment <<EOF - -z defs Report unresolved symbols in object files.\n")); - fprintf (file, _("\ - -z execstack Mark executable as requiring executable stack\n")); -+ fprintf (file, _("\ -+ -z execheap Mark executable as requiring executable heap\n")); - EOF - - if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then -@@ -2391,6 +2403,8 @@ fragment <<EOF - fragment <<EOF - fprintf (file, _("\ - -z noexecstack Mark executable as not requiring executable stack\n")); -+ fprintf (file, _("\ -+ -z noexecheap Mark executable as not requiring executable heap\n")); - EOF - if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then - fragment <<EOF ---- binutils-2.23.52.0.1/ld/ldgram.y -+++ binutils-2.23.52.0.1/ld/ldgram.y -@@ -1119,6 +1119,8 @@ phdr_type: - $$ = exp_intop (0x6474e550); - else if (strcmp (s, "PT_GNU_STACK") == 0) - $$ = exp_intop (0x6474e551); -+ else if (strcmp (s, "PT_PAX_FLAGS") == 0) -+ $$ = exp_intop (0x65041580); - else - { - einfo (_("\ ---- binutils-2.23.52.0.1/ld/testsuite/ld-alpha/tlsbin.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-alpha/tlsbin.rd -@@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align -- PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8 -+ PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+188 R E 0x8 - INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 - .*Requesting program interpreter.* - LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000 - LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 - DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 - TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-alpha/tlsbinr.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-alpha/tlsbinr.rd -@@ -42,6 +42,7 @@ Program Headers: - +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 - +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-alpha/tlspic.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-alpha/tlspic.rd -@@ -38,6 +38,7 @@ Program Headers: - +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 - +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 - +TLS +0x0+10e0 0x0+110e0 0x0+110e0 0x0+60 0x0+80 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-elf/eh1.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-elf/eh1.d -@@ -22,11 +22,11 @@ Contents of the .eh_frame section: - DW_CFA_nop - DW_CFA_nop - --00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 -- DW_CFA_advance_loc: 0 to 00400078 -+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_offset: 16 - DW_CFA_offset: r6 (rbp) at cfa-16 -- DW_CFA_advance_loc: 0 to 00400078 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_register: r6 (rbp) - - 00000038 ZERO terminator ---- binutils-2.23.52.0.1/ld/testsuite/ld-elf/eh2.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-elf/eh2.d -@@ -22,11 +22,11 @@ Contents of the .eh_frame section: - DW_CFA_nop - DW_CFA_nop - --00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 -- DW_CFA_advance_loc: 0 to 00400078 -+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_offset: 16 - DW_CFA_offset: r6 (rbp) at cfa-16 -- DW_CFA_advance_loc: 0 to 00400078 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_register: r6 (rbp) - - 00000038 ZERO terminator ---- binutils-2.23.52.0.1/ld/testsuite/ld-elf/eh3.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-elf/eh3.d -@@ -22,11 +22,11 @@ Contents of the .eh_frame section: - DW_CFA_nop - DW_CFA_nop - --00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 -- DW_CFA_advance_loc: 0 to 00400078 -+00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_offset: 16 - DW_CFA_offset: r6 (rbp) at cfa-16 -- DW_CFA_advance_loc: 0 to 00400078 -+ DW_CFA_advance_loc: 0 to [0-9a-f]+ - DW_CFA_def_cfa_register: r6 (rbp) - - 00000038 ZERO terminator ---- binutils-2.23.52.0.1/ld/testsuite/ld-elf/orphan-region.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-elf/orphan-region.d -@@ -15,7 +15,9 @@ - Program Headers: - Type.* - LOAD[ \t]+0x[0-9a-f]+ 0x0*40000000 0x0*40000000 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x[0-9a-f]+ -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - Segment Sections... - 00 .text .rodata .moredata * -+ 01 + ---- binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsbin.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsbin.rd -@@ -44,6 +44,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -53,6 +54,7 @@ Program Headers: - +03 +.tdata .dynamic .got .got.plt * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsbindesc.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsbindesc.rd -@@ -42,6 +42,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -51,6 +52,7 @@ Program Headers: - +03 +.tdata .dynamic .got .got.plt * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsdesc.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsdesc.rd -@@ -39,6 +39,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -46,6 +47,7 @@ Program Headers: - +01 +.tdata .dynamic .got .got.plt * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsgdesc.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsgdesc.rd -@@ -36,12 +36,14 @@ Program Headers: - +LOAD.* - +LOAD.* - +DYNAMIC.* -+ +PAX_FLAGS.* - - Section to Segment mapping: - +Segment Sections... - +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text * - +01 +.dynamic .got .got.plt * - +02 +.dynamic * -+ +03 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsnopic.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlsnopic.rd -@@ -37,6 +37,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -44,6 +45,7 @@ Program Headers: - +01 +.dynamic .got .got.plt * - +02 +.dynamic * - +03 +.tbss * -+ +04 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlspic.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-i386/tlspic.rd -@@ -40,6 +40,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -47,6 +48,7 @@ Program Headers: - +01 +.tdata .dynamic .got .got.plt * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries: - Offset +Info +Type +Sym.Value +Sym. Name ---- binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge1.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge1.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+1e0 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 c0 04 00 48 00 addl r12=24,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge2.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge2.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+1e0 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 c0 04 00 48 00 addl r12=24,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge3.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge3.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+210 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge4.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge4.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+240 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge5.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-ia64/merge5.d -@@ -4,7 +4,7 @@ - #objdump: -d - - #... --0+270 <.text>: -+[a-f0-9]+ <.text>: - [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; - [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 - [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; ---- binutils-2.23.52.0.1/ld/testsuite/ld-ia64/tlsbin.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-ia64/tlsbin.rd -@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align -- +PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8 -- +INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 -+ +PHDR +0x0+40 0x40+40 0x40+40 (0x[0-9a-f]+) \1 R E 0x8 -+ +INTERP +0x0+([0-9a-f]+) (0x40+\1) \2 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 - .*Requesting program interpreter.* - +LOAD +0x0+ 0x40+ 0x40+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ R E 0x10000 - +LOAD +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000 - +DYNAMIC +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+150 0x0+150 RW +0x8 - +TLS +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+60 0x0+a0 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - +IA_64_UNWIND .* R +0x8 - #... - ---- binutils-2.23.52.0.1/ld/testsuite/ld-ia64/tlspic.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-ia64/tlspic.rd -@@ -40,6 +40,7 @@ Program Headers: - +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000 - +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8 - +TLS +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+60 0x0+80 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8 - #... - ---- binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/multi-got-no-shared.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/multi-got-no-shared.d -@@ -8,9 +8,9 @@ - .*: +file format.* - - Disassembly of section .text: --004000b0 <[^>]*> 3c1c0043 lui gp,0x43 --004000b4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 --004000b8 <[^>]*> afbc0008 sw gp,8(sp) -+004000d0 <[^>]*> 3c1c0043 lui gp,0x43 -+004000d4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 -+004000d8 <[^>]*> afbc0008 sw gp,8(sp) - #... - 00408d60 <[^>]*> 3c1c0043 lui gp,0x43 - 00408d64 <[^>]*> 279c2c98 addiu gp,gp,11416 ---- binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd -@@ -1,7 +1,7 @@ - - Elf file type is DYN (Shared object file) - Entry point .* --There are 5 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -9,6 +9,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.* - * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -18,3 +19,4 @@ Program Headers: - *0*2 * .data .got * - *0*3 * .dynamic * - *0*4 * -+ *0*5 * ---- binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC (Executable file) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 *.got .data * - *0*6 *.dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC (Executable file) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 * .got .data .bss * - *0*6 * .dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC (Executable file) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 * .got .data .bss * - *0*6 * .dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC (Executable file) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 * .got .data .bss * - *0*6 * .dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC (Executable file) - Entry point 0x44000 --There are 7 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -12,6 +12,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -23,3 +24,4 @@ Program Headers: - *0*4 * .got .data .bss * - *0*5 * .dynamic * - *0*6 * -+ *0*7 * ---- binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd -@@ -1,7 +1,7 @@ - - Elf file type is EXEC (Executable file) - Entry point 0x44000 --There are 8 program headers, starting at offset .* -+There are [0-9] program headers, starting at offset .* - - Program Headers: - * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align -@@ -13,6 +13,7 @@ Program Headers: - * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* - * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* -+ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - * NULL * .* - - *Section to Segment mapping: -@@ -25,3 +26,4 @@ Program Headers: - *0*5 * .got .data .bss * - *0*6 * .dynamic * - *0*7 * -+ *0*8 * ---- binutils-2.23.52.0.1/ld/testsuite/ld-powerpc/tlsexe32.r -+++ binutils-2.23.52.0.1/ld/testsuite/ld-powerpc/tlsexe32.r -@@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align -- +PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4 -- +INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1 -+ +PHDR +0x000034 0x01800034 0x01800034 (0x000[0-9a-f]{2}) \1 R E 0x4 -+ +INTERP +0x000([0-9a-f]{3}) 0x01800\1 0x01800\1 0x00011 0x00011 R +0x1 - +[Requesting program interpreter: .*] - +LOAD .* R E 0x10000 - +LOAD .* RWE 0x10000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0001c 0x00038 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -49,6 +50,7 @@ Program Headers: - +03 +.tdata .dynamic .got .plt - +04 +.dynamic - +05 +.tdata .tbss -+ +06 + - - Relocation section '.rela.dyn' at offset .* contains 2 entries: - Offset +Info +Type +Sym. Value +Symbol's Name + Addend ---- binutils-2.23.52.0.1/ld/testsuite/ld-powerpc/tlsso32.r -+++ binutils-2.23.52.0.1/ld/testsuite/ld-powerpc/tlsso32.r -@@ -35,6 +35,7 @@ Program Headers: - +LOAD .* RWE 0x10000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+1c 0x0+38 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -42,6 +43,7 @@ Program Headers: - +01 +.tdata .dynamic .got .plt - +02 +.dynamic - +03 +.tdata .tbss -+ +04 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 18 entries: - Offset +Info +Type +Sym. Value +Symbol's Name + Addend -@@ -52,9 +54,9 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 18 entries: - [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 + 0 - [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 + 0 - [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 + 0 --[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +.tdata + 103e4 --[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +.tdata + 103e8 --[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +.tdata + 103e8 -+[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +.tdata + 10[0-9a-f]{3} -+[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +.tdata + 10[0-9a-f]{3} -+[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +.tdata + 10[0-9a-f]{3} - [0-9a-f ]+R_PPC_DTPMOD32 +0 - [0-9a-f ]+R_PPC_DTPREL32 +0 - [0-9a-f ]+R_PPC_DTPMOD32 +0 ---- binutils-2.23.52.0.1/ld/testsuite/ld-s390/tlsbin.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-s390/tlsbin.rd -@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - +LOAD .* RW +0x1000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+60 0x0+a0 R +0x20 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -52,6 +53,7 @@ Program Headers: - +03 +.tdata .dynamic .got * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rela.dyn' at offset .* contains 4 entries: - Offset +Info +Type +Sym.Value +Sym. Name + Addend ---- binutils-2.23.52.0.1/ld/testsuite/ld-s390/tlsbin_64.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-s390/tlsbin_64.rd -@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - +LOAD .* RW +0x1000 - +DYNAMIC .* RW +0x8 - +TLS .* 0x0+60 0x0+a0 R +0x20 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -52,6 +53,7 @@ Program Headers: - +03 +.tdata .dynamic .got * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: - +Offset +Info +Type +Symbol's Value +Symbol's Name + Addend ---- binutils-2.23.52.0.1/ld/testsuite/ld-s390/tlspic.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-s390/tlspic.rd -@@ -39,6 +39,7 @@ Program Headers: - +LOAD .* RW +0x1000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+60 0x0+80 R +0x20 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -46,6 +47,7 @@ Program Headers: - +01 +.tdata .dynamic .got - +02 +.dynamic - +03 +.tdata .tbss -+ +04 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: - Offset +Info +Type +Sym.Value +Sym. Name + Addend ---- binutils-2.23.52.0.1/ld/testsuite/ld-s390/tlspic_64.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-s390/tlspic_64.rd -@@ -39,6 +39,7 @@ Program Headers: - +LOAD .* RW +0x1000 - +DYNAMIC .* RW +0x8 - +TLS .* 0x0+60 0x0+80 R +0x20 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -46,6 +47,7 @@ Program Headers: - +01 +.tdata .dynamic .got * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: - +Offset +Info +Type +Symbol's Value +Symbol's Name + Addend ---- binutils-2.23.52.0.1/ld/testsuite/ld-sh/tlsbin-2.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sh/tlsbin-2.d -@@ -44,6 +44,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+28 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -53,6 +54,7 @@ Program Headers: - +03 +.tdata .dynamic .got * - +04 +.dynamic * - +05 +.tdata .tbss * -+ +06 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: - Offset +Info +Type +Sym.Value +Sym. Name + Addend ---- binutils-2.23.52.0.1/ld/testsuite/ld-sh/tlspic-2.d -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sh/tlspic-2.d -@@ -32,7 +32,7 @@ Key to Flags: - - Elf file type is DYN (Shared object file) - Entry point 0x[0-9a-f]+ --There are 4 program headers, starting at offset [0-9]+ -+There are [0-9] program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align -@@ -40,6 +40,7 @@ Program Headers: - +LOAD.* - +DYNAMIC.* - +TLS .* 0x0+18 0x0+20 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -47,6 +48,7 @@ Program Headers: - +01 +.tdata .dynamic .got * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 10 entries: - Offset +Info +Type +Sym.Value +Sym. Name + Addend ---- binutils-2.23.52.0.1/ld/testsuite/ld-sparc/gotop32.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sparc/gotop32.rd -@@ -31,6 +31,7 @@ Program Headers: - +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000 - +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000 - +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+70 0x0+70 RW +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-sparc/gotop64.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sparc/gotop64.rd -@@ -31,6 +31,7 @@ Program Headers: - +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000 - +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000 - +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+e0 0x0+e0 RW +0x8 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunbin32.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunbin32.rd -@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align -- +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4 -- +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1 -+ +PHDR +0x0+34 0x0+10034 0x0+10034 (0x[0-9a-f]+) \1 R E 0x4 -+ +INTERP +(0x[0-9a-f]+ ){3}0x0+11 0x0+11 R +0x1 - .*Requesting program interpreter.* - +LOAD .* R E 0x10000 - +LOAD .* RW +0x10000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+1060 0x0+10a0 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunbin64.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunbin64.rd -@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ - - Program Headers: - +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align -- +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8 -- +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1 -+ +PHDR +0x0+40 0x0+100040 0x0+100040 (0x[0-9a-f]+) \1 R E 0x8 -+ +INTERP +0x0+([0-9a-f]+) (0x0+10+\1) \2 0x0+19 0x0+19 R +0x1 - .*Requesting program interpreter.* - +LOAD .* R E 0x100000 - +LOAD .* RW +0x100000 - +DYNAMIC .* RW +0x8 - +TLS .* 0x0+60 0x0+a0 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunnopic32.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunnopic32.rd -@@ -32,6 +32,7 @@ Program Headers: - +LOAD .* RW +0x10000 - +DYNAMIC .* RW +0x4 - +TLS .* 0x0+ 0x0+24 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunnopic64.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunnopic64.rd -@@ -32,6 +32,7 @@ Program Headers: - +LOAD .* RW +0x100000 - +DYNAMIC .* RW +0x8 - +TLS .* 0x0+ 0x0+24 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunpic32.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunpic32.rd -@@ -36,6 +36,7 @@ Program Headers: - +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000 - +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4 - +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunpic64.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-sparc/tlssunpic64.rd -@@ -36,6 +36,7 @@ Program Headers: - +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000 - +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8 - +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+60 0x0+80 R +0x4 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - #... - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: ---- binutils-2.23.52.0.1/ld/testsuite/ld-x86-64/tlsgdesc.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-x86-64/tlsgdesc.rd -@@ -36,12 +36,14 @@ Program Headers: - +LOAD.* - +LOAD.* - +DYNAMIC.* -+ +PAX_FLAGS.* - - Section to Segment mapping: - +Segment Sections... - +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text * - +01 +.dynamic .got .got.plt * - +02 +.dynamic * -+ +03 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries: - +Offset +Info +Type +Symbol's Value +Symbol's Name + Addend ---- binutils-2.23.52.0.1/ld/testsuite/ld-x86-64/tlspic.rd -+++ binutils-2.23.52.0.1/ld/testsuite/ld-x86-64/tlspic.rd -@@ -40,6 +40,7 @@ Program Headers: - +LOAD +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+244 0x0+244 RW +0x200000 - +DYNAMIC +0x0+1210 0x0+201210 0x0+201210 0x0+130 0x0+130 RW +0x8 - +TLS +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+60 0x0+80 R +0x1 -+ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] - - Section to Segment mapping: - +Segment Sections... -@@ -47,6 +48,7 @@ Program Headers: - +01 +.tdata .dynamic .got .got.plt * - +02 +.dynamic * - +03 +.tdata .tbss * -+ +04 + - - Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: - +Offset +Info +Type +Symbol's Value +Symbol's Name + Addend diff --git a/binutils/patches/binutils-2.24-DW_FORM_ref_addr.patch0 b/binutils/patches/binutils-2.24-DW_FORM_ref_addr.patch0 new file mode 100644 index 0000000..92ef150 --- /dev/null +++ b/binutils/patches/binutils-2.24-DW_FORM_ref_addr.patch0 @@ -0,0 +1,44 @@ +*** ../binutils-2.24.orig/bfd/dwarf2.c 2014-01-28 11:58:02.072737296 +0000 +--- bfd/dwarf2.c 2014-01-28 11:59:38.575739971 +0000 +*************** find_abstract_instance_name (struct comp +*** 2126,2131 **** +--- 2126,2153 ---- + abort (); + + info_ptr = unit->sec_info_ptr + die_ref; ++ ++ /* Now find the CU containing this pointer. */ ++ if (info_ptr >= unit->info_ptr_unit && info_ptr < unit->end_ptr) ++ ; ++ else ++ { ++ /* Check other CUs to see if they contain the abbrev. */ ++ struct comp_unit * u; ++ ++ for (u = unit->prev_unit; u != NULL; u = u->prev_unit) ++ if (info_ptr >= u->info_ptr_unit && info_ptr < u->end_ptr) ++ break; ++ ++ if (u == NULL) ++ for (u = unit->next_unit; u != NULL; u = u->next_unit) ++ if (info_ptr >= u->info_ptr_unit && info_ptr < u->end_ptr) ++ break; ++ ++ if (u) ++ unit = u; ++ /* else FIXME: What do we do now ? */ ++ } + } + else if (attr_ptr->form == DW_FORM_GNU_ref_alt) + { +*************** find_abstract_instance_name (struct comp +*** 2137,2142 **** +--- 2159,2166 ---- + bfd_set_error (bfd_error_bad_value); + return name; + } ++ /* FIXME: Do we need to locate the correct CU, in a similar ++ fashion to the code in the DW_FORM_ref_addr case above ? */ + } + else + info_ptr = unit->info_ptr_unit + die_ref; diff --git a/binutils/patches/binutils-2.24-aarch64-fix-final_link_relocate.patch b/binutils/patches/binutils-2.24-aarch64-fix-final_link_relocate.patch new file mode 100644 index 0000000..8c2d37b --- /dev/null +++ b/binutils/patches/binutils-2.24-aarch64-fix-final_link_relocate.patch @@ -0,0 +1,54 @@ +commit f44a1f8e513b37bcc52ba9ea0c172c3e94852756 +Author: Christophe Lyon christophe.lyon@st.com +Date: Tue Jan 14 15:53:50 2014 +0100 + + 2014-01-14 Michael Hudson-Doyle michael.hudson@linaro.org + Kugan Vivekanandarajah kugan.vivekanandarajah@linaro.org + + bfd/ + * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Use correct + offset while calculating relocation address. + (elfNN_aarch64_create_small_pltn_entry): Likewise. + (elfNN_aarch64_init_small_plt0_entry): Likewise. + +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -3844,7 +3844,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, + + value = (symbol_got_offset (input_bfd, h, r_symndx) + + globals->root.sgot->output_section->vma +- + globals->root.sgot->output_section->output_offset); ++ + globals->root.sgot->output_offset); + + value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value, + 0, weak_undef_p); +@@ -3873,10 +3873,9 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, + case BFD_RELOC_AARCH64_TLSDESC_LDR: + if (globals->root.sgot == NULL) + return bfd_reloc_notsupported; +- + value = (symbol_tlsdesc_got_offset (input_bfd, h, r_symndx) + + globals->root.sgotplt->output_section->vma +- + globals->root.sgotplt->output_section->output_offset ++ + globals->root.sgotplt->output_offset + + globals->sgotplt_jump_table_size); + + value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value, +@@ -6627,7 +6626,7 @@ elfNN_aarch64_create_small_pltn_entry (struct elf_link_hash_entry *h, + + plt_entry = plt->contents + h->plt.offset; + plt_entry_address = plt->output_section->vma +- + plt->output_section->output_offset + h->plt.offset; ++ + plt->output_offset + h->plt.offset; + gotplt_entry_address = gotplt->output_section->vma + + gotplt->output_offset + got_offset; + +@@ -6934,7 +6933,7 @@ elfNN_aarch64_init_small_plt0_entry (bfd *output_bfd ATTRIBUTE_UNUSED, + + GOT_ENTRY_SIZE * 2); + + plt_base = htab->root.splt->output_section->vma + +- htab->root.splt->output_section->output_offset; ++ htab->root.splt->output_offset; + + /* Fill in the top 21 bits for this: ADRP x16, PLT_GOT + n * 8. + ADRP: ((PG(S+A)-PG(P)) >> 12) & 0x1fffff */ diff --git a/binutils/patches/binutils-2.24-aarch64-fix-gotplt-offset-ifunc.patch b/binutils/patches/binutils-2.24-aarch64-fix-gotplt-offset-ifunc.patch new file mode 100644 index 0000000..64a1d9c --- /dev/null +++ b/binutils/patches/binutils-2.24-aarch64-fix-gotplt-offset-ifunc.patch @@ -0,0 +1,103 @@ +commit 67428c4aa56d4183d0f531e0d752040745a94423 +Author: Will Newton will.newton@linaro.org +Date: Mon Nov 25 11:07:07 2013 +0000 + + bfd/elfnn-aarch64.c: Fix miscalculation of GOTPLT offset for ifunc syms. + + The .got.plt header size was not being correctly taken into account + when calculating the offset for relocations against ifunc symbols. + + bfd/ChangeLog: + + 2013-11-26 Will Newton will.newton@linaro.org + + * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Ensure + PLT_INDEX is calculated using correct header size. + + ld/testsuite/ChangeLog: + + 2013-11-26 Will Newton will.newton@linaro.org + + * ld-aarch64/aarch64-elf.exp: Add ifunc-21 test. + * ld-aarch64/ifunc-21.d: New file. + * ld-aarch64/ifunc-21.s: Likewise. + +diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c +index 6bc414e..3cd3a18 100644 +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -3589,7 +3589,8 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, + + if (globals->root.splt != NULL) + { +- plt_index = h->plt.offset / globals->plt_entry_size - 1; ++ plt_index = ((h->plt.offset - globals->plt_header_size) / ++ globals->plt_entry_size); + off = (plt_index + 3) * GOT_ENTRY_SIZE; + base_got = globals->root.sgotplt; + } +diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp +index 5c150dd..a6b3ea2 100644 +--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp ++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp +@@ -155,3 +155,4 @@ run_dump_test "ifunc-18b" + run_dump_test "ifunc-19a" + run_dump_test "ifunc-19b" + run_dump_test "ifunc-20" ++run_dump_test "ifunc-21" +diff --git a/ld/testsuite/ld-aarch64/ifunc-21.d b/ld/testsuite/ld-aarch64/ifunc-21.d +new file mode 100644 +index 0000000..fa139b2 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/ifunc-21.d +@@ -0,0 +1,31 @@ ++#source: ifunc-21.s ++#ld: -shared -z nocombreloc ++#objdump: -d -s -j .got.plt -j .text ++#target: aarch64*-*-* ++ ++# Ensure the .got.plt slot used is correct ++ ++.*: file format elf64-(little|big)aarch64 ++ ++Contents of section .text: ++ 02a0 .* ++Contents of section .got.plt: ++ 103a8 0+ 0+ 0+ 0+ .* ++ 103b8 0+ 0+ [0-9a-f]+ 0+ .* ++ ++Disassembly of section .text: ++ ++0+2a0 <ifunc>: ++ 2a0: d65f03c0 ret ++ ++0+2a4 <bar>: ++ 2a4: 90000080 adrp x0, 10000 <.*> ++ 2a8: f941e000 ldr x0, [x0,#960] ++ 2ac: d65f03c0 ret ++ ++Disassembly of section .got.plt: ++ ++.*: ++.* ++.* ++.* +diff --git a/ld/testsuite/ld-aarch64/ifunc-21.s b/ld/testsuite/ld-aarch64/ifunc-21.s +new file mode 100644 +index 0000000..a1563dc +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/ifunc-21.s +@@ -0,0 +1,13 @@ ++ .text ++ .type ifunc, @gnu_indirect_function ++ .hidden ifunc ++ifunc: ++ ret ++ .size ifunc, .-ifunc ++ .type bar, @function ++ .globl bar ++bar: ++ adrp x0, :got:ifunc ++ ldr x0, [x0, #:got_lo12:ifunc] ++ ret ++ .size bar, .-bar diff --git a/binutils/patches/binutils-2.24-aarch64-fix-ie-relax.patch b/binutils/patches/binutils-2.24-aarch64-fix-ie-relax.patch new file mode 100644 index 0000000..d9157ea --- /dev/null +++ b/binutils/patches/binutils-2.24-aarch64-fix-ie-relax.patch @@ -0,0 +1,40 @@ +commit 44f814ce5066f10a3bed29c45d10e0d38f4fa433 +Author: Marcus Shawcroft marcus.shawcroft@arm.com +Date: Tue Apr 15 17:46:07 2014 +0100 + + [AArch64] Fix off by one error in instruction relaxation mask. + + The AArch64 TLSDESC to IE relaxation code uses a bit mask intended to + ensure that destination register in a relaxed ldr instruction is + always X0. The mask has an off by one error resulting in the most + significant bit of the destination register being retained in the + relaxed instruction. The issue generally appears when the compiler + emits TLS accesses code under high register pressure resulting in a + broken code sequence. + +diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c +index 42c83fb..8503419 100644 +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -3957,7 +3957,7 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, + ldr xd, [x0, #:tlsdesc_lo12:var] => ldr x0, [x0, #:gottprel_lo12:var] + */ + insn = bfd_getl32 (contents + rel->r_offset); +- insn &= 0xfffffff0; ++ insn &= 0xffffffe0; + bfd_putl32 (insn, contents + rel->r_offset); + return bfd_reloc_continue; + } +diff --git a/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie.s b/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie.s +index c20690c..38b3721 100644 +--- a/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie.s ++++ b/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie.s +@@ -4,7 +4,7 @@ var: + .word 2 + .text + adrp x0, :tlsdesc:var +- ldr x1, [x0, #:tlsdesc_lo12:var] ++ ldr x17, [x0, #:tlsdesc_lo12:var] + add x0, x0, :tlsdesc_lo12:var + .tlsdesccall var + blr x1 diff --git a/binutils/patches/binutils-2.24-aarch64-fix-static-ifunc.patch b/binutils/patches/binutils-2.24-aarch64-fix-static-ifunc.patch new file mode 100644 index 0000000..296f162 --- /dev/null +++ b/binutils/patches/binutils-2.24-aarch64-fix-static-ifunc.patch @@ -0,0 +1,118 @@ +commit 14d96265dd8fd934d868c0b8e1991e2fefbe9fc8 +Author: Will Newton will.newton@linaro.org +Date: Mon Nov 25 14:44:59 2013 +0000 + + bfd/elfnn-aarch64.c: Handle static links with ifunc correctly. + + The code for handling GOT references to ifunc symbols in static links + was missing. + + bfd/ChangeLog: + + 2013-11-26 Will Newton will.newton@linaro.org + + * elfnn-aarch64.c (elfNN_aarch64_finish_dynamic_symbol): + Handle STT_GNU_IFUNC symbols correctly in static links. + + ld/testsuite/ChangeLog: + + 2013-11-26 Will Newton will.newton@linaro.org + + * ld-aarch64/aarch64-elf.exp: Add ifunc-22. + * ld-aarch64/ifunc-22.d: New file. + * ld-aarch64/ifunc-22.s: Likewise. + +diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c +index 3cd3a18..9053635 100644 +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -6824,7 +6824,34 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd, + + htab->root.sgot->output_offset + + (h->got.offset & ~(bfd_vma) 1)); + +- if (info->shared && SYMBOL_REFERENCES_LOCAL (info, h)) ++ if (h->def_regular ++ && h->type == STT_GNU_IFUNC) ++ { ++ if (info->shared) ++ { ++ /* Generate R_AARCH64_GLOB_DAT. */ ++ goto do_glob_dat; ++ } ++ else ++ { ++ asection *plt; ++ ++ if (!h->pointer_equality_needed) ++ abort (); ++ ++ /* For non-shared object, we can't use .got.plt, which ++ contains the real function address if we need pointer ++ equality. We load the GOT entry with the PLT entry. */ ++ plt = htab->root.splt ? htab->root.splt : htab->root.iplt; ++ bfd_put_NN (output_bfd, (plt->output_section->vma ++ + plt->output_offset ++ + h->plt.offset), ++ htab->root.sgot->contents ++ + (h->got.offset & ~(bfd_vma) 1)); ++ return TRUE; ++ } ++ } ++ else if (info->shared && SYMBOL_REFERENCES_LOCAL (info, h)) + { + if (!h->def_regular) + return FALSE; +@@ -6837,6 +6864,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd, + } + else + { ++do_glob_dat: + BFD_ASSERT ((h->got.offset & 1) == 0); + bfd_put_NN (output_bfd, (bfd_vma) 0, + htab->root.sgot->contents + h->got.offset); +diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp +index a6b3ea2..692bf34 100644 +--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp ++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp +@@ -156,3 +156,4 @@ run_dump_test "ifunc-19a" + run_dump_test "ifunc-19b" + run_dump_test "ifunc-20" + run_dump_test "ifunc-21" ++run_dump_test "ifunc-22" +diff --git a/ld/testsuite/ld-aarch64/ifunc-22.d b/ld/testsuite/ld-aarch64/ifunc-22.d +new file mode 100644 +index 0000000..f28b039 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/ifunc-22.d +@@ -0,0 +1,11 @@ ++#source: ifunc-22.s ++#objdump: -s -j .got ++#ld: -static ++#target: aarch64*-*-* ++ ++# Ensure GOT is populated correctly in static link ++ ++.*: file format elf64-(little|big)aarch64 ++ ++Contents of section .got: ++ 4100f0 00000000 00000000 d0004000 00000000 ..........@..... +diff --git a/ld/testsuite/ld-aarch64/ifunc-22.s b/ld/testsuite/ld-aarch64/ifunc-22.s +new file mode 100644 +index 0000000..69a87bb +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/ifunc-22.s +@@ -0,0 +1,14 @@ ++ .text ++ .type ifunc, @gnu_indirect_function ++ .global ifunc ++ifunc: ++ ret ++ .size ifunc, .-ifunc ++ .type _start, @function ++ .globl _start ++_start: ++ adrp x0, :got:ifunc ++ ldr x0, [x0, #:got_lo12:ifunc] ++ .size _start, .-_start ++ .data ++ .xword ifunc diff --git a/binutils/patches/binutils-2.24-aarch64-ld-shared-non-PIC-xfail.patch b/binutils/patches/binutils-2.24-aarch64-ld-shared-non-PIC-xfail.patch new file mode 100644 index 0000000..8525596 --- /dev/null +++ b/binutils/patches/binutils-2.24-aarch64-ld-shared-non-PIC-xfail.patch @@ -0,0 +1,55 @@ +commit 273dc279306c2b69fbc1407cc695397e4b015152 +Author: Will Newton will.newton@linaro.org +Date: Fri May 16 15:22:58 2014 +0100 + + ld/aarch64: xfail non-PIC shared object tests on aarch64 + + aarch64 does not support building non-PIC shared objects, so mark + tests for these as xfail. + + ld/testsuite/ChangeLog: + + 2014-05-20 Will Newton will.newton@linaro.org + + * ld-shared/shared.exp: Mark non-PIC shared object tests + as xfail on aarch64. + +#-- a/ld/testsuite/ChangeLog +#++ b/ld/testsuite/ChangeLog +#@ -1,3 +1,8 @@ ++2014-05-20 Will Newton will.newton@linaro.org ++ ++ * ld-shared/shared.exp: Mark non-PIC shared object tests ++ as xfail on aarch64. ++ + 2014-05-19 Andreas Tobler andreast@fgznet.ch + + * ld-elf/shared.exp: Introduce the extralibs variable to control +diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp +index 9996ece..c723ef7 100644 +--- a/ld/testsuite/ld-shared/shared.exp ++++ b/ld/testsuite/ld-shared/shared.exp +@@ -244,6 +244,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o] + if [ string match $shared_needs_pic "yes" ] { + setup_xfail "arm*-*-linux*" + } ++ setup_xfail "aarch64*-*-linux*" + shared_test shnp "shared (non PIC)" mainnp.o sh1np.o sh2np.o shared + + # Test ELF shared library relocations with a non-zero load +@@ -270,6 +271,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o] + if [ string match $shared_needs_pic "yes" ] { + setup_xfail "arm*-*-linux*" + } ++ setup_xfail "aarch64*-*-linux*" + shared_test shnp "shared (non PIC, load offset)" \ + mainnp.o sh1np.o sh2np.o shared \ + "-T $srcdir/$subdir/elf-offset.ld" +@@ -326,6 +328,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/m + if [ string match $shared_needs_pic "yes" ] { + setup_xfail "arm*-*-linux*" + } ++ setup_xfail "aarch64*-*-linux*" + shared_test shmpnp "shared (PIC main, non PIC so)" mainp.o sh1np.o sh2np.o shared + } + } else { diff --git a/binutils/patches/binutils-2.24-arm-static-tls.patch b/binutils/patches/binutils-2.24-arm-static-tls.patch new file mode 100644 index 0000000..2b580f1 --- /dev/null +++ b/binutils/patches/binutils-2.24-arm-static-tls.patch @@ -0,0 +1,42 @@ +commit eea6dad2b3ae91189caa91145dd133bae0398d21 +Author: Kyle McMartin kyle@redhat.com +Date: Fri Jun 20 11:14:09 2014 +0100 + + Similarly to the AArch64 patch, set DF_STATIC_TLS for consistency with + other architectures when we emit IE relocs in a shared library. + + * elf32-arm.c (elf32_arm_check_relocs): Set DF_STATIC_TLS when + emitting initial-exec relocs when not linking an executable. + +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -12711,6 +12711,9 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info, + default: tls_type = GOT_NORMAL; break; + } + ++ if (!info->executable && (tls_type & GOT_TLS_IE)) ++ info->flags |= DF_STATIC_TLS; ++ + if (h != NULL) + { + h->got.refcount++; +--- a/ld/testsuite/ld-arm/tls-gdierelax2.d ++++ b/ld/testsuite/ld-arm/tls-gdierelax2.d +@@ -11,13 +11,13 @@ Disassembly of section .text: + [0-9a-f]+: e59f0004 ldr r0, [pc, #4] ; .* + [0-9a-f]+: e79f0000 ldr r0, [pc, r0] + [0-9a-f]+: e1a00000 nop ; .* +- [0-9a-f]+: 00008098 .word 0x00008098 +- [0-9a-f]+: 0000809c .word 0x0000809c ++ [0-9a-f]+: 000080a0 .word 0x000080a0 ++ [0-9a-f]+: 000080a4 .word 0x000080a4 + + [0-9a-f]+ <bar>: + [0-9a-f]+: 4801 ldr r0, [pc, #4] ; .* + [0-9a-f]+: 4478 add r0, pc + [0-9a-f]+: 6800 ldr r0, [r0, #0] + [0-9a-f]+: 46c0 nop ; .* +- [0-9a-f]+: 0000808a .word 0x0000808a +- [0-9a-f]+: 0000808c .word 0x0000808c ++ [0-9a-f]+: 00008092 .word 0x00008092 ++ [0-9a-f]+: 00008094 .word 0x00008094 diff --git a/binutils/patches/binutils-2.24-elfnn-aarch64.patch0 b/binutils/patches/binutils-2.24-elfnn-aarch64.patch0 new file mode 100644 index 0000000..469387b --- /dev/null +++ b/binutils/patches/binutils-2.24-elfnn-aarch64.patch0 @@ -0,0 +1,21 @@ +*** ../binutils-2.24.orig/bfd/elfnn-aarch64.c 2013-12-17 11:16:28.723807381 +0000 +--- bfd/elfnn-aarch64.c 2013-12-17 11:18:13.517804067 +0000 +*************** _aarch64_elf_section_data; +*** 1679,1686 **** + #define elf_aarch64_section_data(sec) \ + ((_aarch64_elf_section_data *) elf_section_data (sec)) + +! /* The size of the thread control block. */ +! #define TCB_SIZE 16 + + struct elf_aarch64_local_symbol + { +--- 1679,1686 ---- + #define elf_aarch64_section_data(sec) \ + ((_aarch64_elf_section_data *) elf_section_data (sec)) + +! /* The size of the thread control block which is defined to be two pointers. */ +! #define TCB_SIZE (ARCH_SIZE/8)*2 + + struct elf_aarch64_local_symbol + { diff --git a/binutils/patches/binutils-2.24-fake-zlib-sections.patch0 b/binutils/patches/binutils-2.24-fake-zlib-sections.patch0 new file mode 100644 index 0000000..e02dd51 --- /dev/null +++ b/binutils/patches/binutils-2.24-fake-zlib-sections.patch0 @@ -0,0 +1,30 @@ +*** ../binutils-2.24.orig/bfd/compress.c 2014-04-28 16:35:20.429816317 +0100 +--- bfd/compress.c 2014-04-28 16:36:06.450963028 +0100 +*************** +*** 25,30 **** +--- 25,31 ---- + #ifdef HAVE_ZLIB_H + #include <zlib.h> + #endif ++ #include "safe-ctype.h" + + #ifdef HAVE_ZLIB_H + static bfd_boolean +*************** bfd_is_section_compressed (bfd *abfd, se +*** 304,309 **** +--- 305,319 ---- + compressed = (bfd_get_section_contents (abfd, sec, compressed_buffer, 0, 12) + && CONST_STRNEQ ((char*) compressed_buffer, "ZLIB")); + ++ /* Check for the pathalogical case of a debug string section that ++ contains the string ZLIB.... as the first entry. We assume that ++ no uncompressed .debug_str section would ever be big enough to ++ have the first byte of its (big-endian) size be non-zero. */ ++ if (compressed ++ && strcmp (sec->name, ".debug_str") == 0 ++ && ISPRINT (compressed_buffer[4])) ++ compressed = FALSE; ++ + /* Restore compress_status. */ + sec->compress_status = saved; + return compressed; diff --git a/binutils/patches/binutils-2.24-fat-lto-objects.patch b/binutils/patches/binutils-2.24-fat-lto-objects.patch new file mode 100644 index 0000000..fe9c334 --- /dev/null +++ b/binutils/patches/binutils-2.24-fat-lto-objects.patch @@ -0,0 +1,57 @@ +commit b35d44f1af711925bfa4344ef00470fee67122f1 +Author: Kyrylo Tkachov kyrylo.tkachov@arm.com +Date: Wed Nov 27 13:43:39 2013 +0000 + + [ld/testsuite/] + 2013-11-27 Kyrylo Tkachov kyrylo.tkachov@arm.com + + * ld-plugin/lto.exp: Add -ffat-lto-objects. + * lib/ld-lib.exp (check_lto_available): Likewise. + +--- a/ld/testsuite/ld-plugin/lto.exp ++++ b/ld/testsuite/ld-plugin/lto.exp +@@ -57,7 +57,7 @@ set lto_link_tests { + "" "-O2" + {lto-3c.c} {} "libdummy.a"} + {"Build liblto-3.a" +- "" "-flto" ++ "" "-flto -ffat-lto-objects" + {lto-3b.c} {} "liblto-3.a"} + {"Build libdummy.a 5a" + "" "-flto" +@@ -111,7 +111,7 @@ set lto_link_tests { + "" "" + {pr12758a.s} {} "libdummy.a"} + {"Build libpr12758.a" +- "" "-flto -O2" ++ "" "-flto -O2 -ffat-lto-objects" + {pr12758b.c} {} "libpr12758.a"} + {"PR ld/12758" + "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12758a.o -Wl,--start-group tmpdir/libpr12758.a -Wl,--end-group" "" +@@ -120,13 +120,13 @@ set lto_link_tests { + "" "" + {pr12760a.c} {} "libdummy.a"} + {"Build libpr12760.a" +- "" "-flto -O2" ++ "" "-flto -O2 -ffat-lto-objects" + {pr12760b.c} {} "libpr12760.a"} + {"PR ld/12760" + "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12760a.o -Wl,--start-group tmpdir/libpr12760.a -Wl,--end-group" "" + {dummy.c} {} "pr12760.exe" "c" "warning: Bad bar"} + {"Build libpr13183.a" +- "-T" "-flto -O2" ++ "-T" "-flto -O2 -ffat-lto-objects" + {pr13183a.c} {} "libpr13183.a"} + {"Build libdummy.a PR ld/13183" + "" "-flto -O2" +--- a/ld/testsuite/lib/ld-lib.exp ++++ b/ld/testsuite/lib/ld-lib.exp +@@ -1643,7 +1643,7 @@ proc check_lto_available { } { + set f [open $src "w"] + puts $f "" + close $f +- set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -fuse-linker-plugin $src -o $output"] ++ set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -ffat-lto-objects -fuse-linker-plugin $src -o $output"] + if { [lindex $status 0] == 0 } { + set lto_available_saved 1 + } else { diff --git a/binutils/patches/binutils-2.24-indirect-chain.patch0 b/binutils/patches/binutils-2.24-indirect-chain.patch0 new file mode 100644 index 0000000..b255424 --- /dev/null +++ b/binutils/patches/binutils-2.24-indirect-chain.patch0 @@ -0,0 +1,28 @@ +*** ../binutils-2.24.orig/bfd/elflink.c 2014-08-21 09:17:27.753408085 +0100 +--- bfd/elflink.c 2014-08-21 10:04:52.174935912 +0100 +*************** _bfd_elf_add_default_symbol (bfd *abfd, +*** 1705,1710 **** +--- 1705,1716 ---- + ht = (struct elf_link_hash_entry *) hi->root.u.i.link; + (*bed->elf_backend_copy_indirect_symbol) (info, ht, hi); + ++ /* A reference to the SHORTNAME symbol from a dynamic library ++ will be satisfied by the versioned symbol at runtime. In ++ effect, we have a reference to the versioned symbol. */ ++ ht->ref_dynamic_nonweak |= hi->ref_dynamic_nonweak; ++ hi->dynamic_def |= ht->dynamic_def; ++ + /* See if the new flags lead us to realize that the symbol must + be dynamic. */ + if (! *dynsym) +*************** nondefault: +*** 1774,1779 **** +--- 1780,1787 ---- + if (hi->root.type == bfd_link_hash_indirect) + { + (*bed->elf_backend_copy_indirect_symbol) (info, h, hi); ++ h->ref_dynamic_nonweak |= hi->ref_dynamic_nonweak; ++ hi->dynamic_def |= h->dynamic_def; + + /* See if the new flags lead us to realize that the symbol + must be dynamic. */ diff --git a/binutils/patches/binutils-2.24-ldforcele.patch0 b/binutils/patches/binutils-2.24-ldforcele.patch0 new file mode 100644 index 0000000..6a46c78 --- /dev/null +++ b/binutils/patches/binutils-2.24-ldforcele.patch0 @@ -0,0 +1,58 @@ +Common subdirectories: ../binutils-2.24.orig/ld/emulparams and ld/emulparams +Common subdirectories: ../binutils-2.24.orig/ld/emultempl and ld/emultempl +diff -cp ../binutils-2.24.orig/ld/ldlang.c ld/ldlang.c +*** ../binutils-2.24.orig/ld/ldlang.c 2014-05-09 10:35:04.589504928 +0100 +--- ld/ldlang.c 2014-05-09 10:35:55.515661478 +0100 +*************** lang_add_output_format (const char *form +*** 7096,7101 **** +--- 7096,7113 ---- + && little != NULL) + format = little; + ++ if (getenv ("LD_FORCE_LE") != NULL) ++ { ++ if (strcmp (format, "elf64-powerpc") == 0) ++ format = "elf64-powerpcle"; ++ else if (strcmp (format, "elf32-powerpc") == 0) ++ format = "elf32-powerpcle"; ++ else if (strcmp (format, "elf64-big") == 0) ++ format = "elf64-little"; ++ else if (strcmp (format, "elf32-big") == 0) ++ format = "elf32-little"; ++ } ++ + output_target = format; + } + } +Only in ld: ldlang.c.orig +diff -cp ../binutils-2.24.orig/ld/ldmain.c ld/ldmain.c +*** ../binutils-2.24.orig/ld/ldmain.c 2014-05-09 10:35:04.593504941 +0100 +--- ld/ldmain.c 2014-05-09 10:35:55.515661478 +0100 +*************** get_emulation (int argc, char **argv) +*** 603,608 **** +--- 603,620 ---- + } + } + ++ if ((strncmp (emulation, "elf64ppc", 8) == 0 ++ || strncmp (emulation, "elf32ppc", 8) == 0) ++ && getenv ("LD_FORCE_LE") != NULL) ++ { ++ size_t len = strlen (emulation); ++ char *le = xmalloc (len + 2); ++ memcpy (le, emulation, 5); ++ le[5] = 'l'; ++ memcpy (le + 6, emulation + 5, len - 4); ++ emulation = le; ++ } ++ + return emulation; + } + +Only in ld: ldmain.c.orig +Common subdirectories: ../binutils-2.24.orig/ld/ldscripts and ld/ldscripts +Common subdirectories: ../binutils-2.24.orig/ld/.libs and ld/.libs +Common subdirectories: ../binutils-2.24.orig/ld/po and ld/po +Common subdirectories: ../binutils-2.24.orig/ld/scripttempl and ld/scripttempl +Common subdirectories: ../binutils-2.24.orig/ld/testsuite and ld/testsuite +Common subdirectories: ../binutils-2.24.orig/ld/tmpdir and ld/tmpdir diff --git a/binutils/patches/binutils-2.24-pt-pax-flags-20131231.patch b/binutils/patches/binutils-2.24-pt-pax-flags-20131231.patch new file mode 100644 index 0000000..cfb2035 --- /dev/null +++ b/binutils/patches/binutils-2.24-pt-pax-flags-20131231.patch @@ -0,0 +1,1030 @@ +--- binutils-2.24/bfd/elf-bfd.h ++++ binutils-2.24/bfd/elf-bfd.h +@@ -1577,6 +1577,9 @@ struct elf_obj_tdata + /* Segment flags for the PT_GNU_STACK segment. */ + unsigned int stack_flags; + ++ /* Segment flags for the PT_PAX_FLAGS segment. */ ++ unsigned int pax_flags; ++ + /* This is set to TRUE if the object was created by the backend + linker. */ + bfd_boolean linker; +@@ -1707,6 +1707,7 @@ + #define elf_eh_frame_hdr(bfd) (elf_tdata(bfd) -> o->eh_frame_hdr) + #define elf_linker(bfd) (elf_tdata(bfd) -> o->linker) + #define elf_stack_flags(bfd) (elf_tdata(bfd) -> o->stack_flags) ++#define elf_pax_flags(bfd) (elf_tdata(bfd) -> o->pax_flags) + #define elf_shstrtab(bfd) (elf_tdata(bfd) -> o->strtab_ptr) + #define elf_onesymtab(bfd) (elf_tdata(bfd) -> symtab_section) + #define elf_symtab_shndx(bfd) (elf_tdata(bfd) -> symtab_shndx_section) +--- binutils-2.24/bfd/elf.c ++++ binutils-2.24/bfd/elf.c +@@ -1158,6 +1158,7 @@ get_segment_type (unsigned int p_type) + case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break; + case PT_GNU_STACK: pt = "STACK"; break; + case PT_GNU_RELRO: pt = "RELRO"; break; ++ case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break; + default: pt = NULL; break; + } + return pt; +@@ -2477,6 +2478,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index) + case PT_GNU_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, hdr_index, "pax_flags"); ++ + default: + /* Check for any processor-specific program segment types. */ + bed = get_elf_backend_data (abfd); +@@ -3551,6 +3555,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info) + ++segs; + } + ++ { ++ /* We need a PT_PAX_FLAGS segment. */ ++ ++segs; ++ } ++ + for (s = abfd->sections; s != NULL; s = s->next) + { + if ((s->flags & SEC_LOAD) != 0 +@@ -4153,6 +4162,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info) + } + } + ++ { ++ amt = sizeof (struct elf_segment_map); ++ m = bfd_zalloc (abfd, amt); ++ if (m == NULL) ++ goto error_return; ++ m->next = NULL; ++ m->p_type = PT_PAX_FLAGS; ++ m->p_flags = elf_pax_flags (abfd); ++ m->p_flags_valid = 1; ++ ++ *pm = m; ++ pm = &m->next; ++ } ++ + free (sections); + elf_tdata (abfd)->segment_map = mfirst; + } +@@ -5417,7 +5440,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) + 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 +- (with the possible exception of .dynamic). */ ++ (with the possible exception of .dynamic). ++ 9. PT_PAX_FLAGS segments do not include any sections. */ + #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \ + ((((segment->p_paddr \ + ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr) \ +@@ -5425,6 +5449,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) + && (section->flags & SEC_ALLOC) != 0) \ + || IS_NOTE (segment, section)) \ + && segment->p_type != PT_GNU_STACK \ ++ && segment->p_type != PT_PAX_FLAGS \ + && (segment->p_type != PT_TLS \ + || (section->flags & SEC_THREAD_LOCAL)) \ + && (segment->p_type == PT_LOAD \ +--- binutils-2.24/bfd/elflink.c ++++ binutils-2.24/bfd/elflink.c +@@ -5545,17 +5545,30 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, + && ! (*bed->elf_backend_always_size_sections) (output_bfd, info)) + return FALSE; + ++ elf_pax_flags (output_bfd) = PF_NORANDEXEC; ++ if (info->execheap) ++ elf_pax_flags (output_bfd) |= PF_NOMPROTECT; ++ else if (info->noexecheap) ++ elf_pax_flags (output_bfd) |= PF_MPROTECT; ++ + /* Determine any GNU_STACK segment requirements, after the backend + has had a chance to set a default segment size. */ + if (info->execstack) +- elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X; ++ { ++ elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X; ++ elf_pax_flags (output_bfd) |= PF_EMUTRAMP; ++ } + else if (info->noexecstack) +- elf_stack_flags (output_bfd) = PF_R | PF_W; ++ { ++ elf_stack_flags (output_bfd) = PF_R | PF_W; ++ elf_pax_flags (output_bfd) |= PF_NOEMUTRAMP; ++ } + else + { + bfd *inputobj; + asection *notesec = NULL; + int exec = 0; + ++ elf_pax_flags (output_bfd) |= PF_NOEMUTRAMP; + for (inputobj = info->input_bfds; + inputobj; + inputobj = inputobj->link_next) +@@ -5567,7 +5581,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, + if (s) + { + if (s->flags & SEC_CODE) +- exec = PF_X; ++ { ++ elf_pax_flags (output_bfd) &= ~PF_NOEMUTRAMP; ++ elf_pax_flags (output_bfd) |= PF_EMUTRAMP; ++ exec = PF_X; ++ } + notesec = s; + } + else if (bed->default_execstack) +--- binutils-2.24/binutils/readelf.c ++++ binutils-2.24/binutils/readelf.c +@@ -2740,6 +2740,7 @@ get_segment_type (unsigned long p_type) + return "GNU_EH_FRAME"; + case PT_GNU_STACK: return "GNU_STACK"; + case PT_GNU_RELRO: return "GNU_RELRO"; ++ case PT_PAX_FLAGS: return "PAX_FLAGS"; + + default: + if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) +--- binutils-2.24/include/bfdlink.h ++++ binutils-2.24/include/bfdlink.h +@@ -322,6 +322,14 @@ struct bfd_link_info + /* TRUE if PT_GNU_RELRO segment should be created. */ + unsigned int relro: 1; + ++ /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT ++ flags. */ ++ unsigned int execheap: 1; ++ ++ /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT ++ flags. */ ++ unsigned int noexecheap: 1; ++ + /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment + should be created. */ + unsigned int eh_frame_hdr: 1; +--- binutils-2.24/include/elf/common.h ++++ binutils-2.24/include/elf/common.h +@@ -429,6 +429,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_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */ + + /* Program segment permissions, in program header p_flags field. */ + +@@ -439,6 +440,21 @@ + #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */ + #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */ + ++/* Flags to control PaX behavior. */ ++ ++#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.24/ld/emultempl/elf32.em ++++ binutils-2.24/ld/emultempl/elf32.em +@@ -2285,6 +2285,16 @@ fragment <<EOF + link_info.noexecstack = TRUE; + link_info.execstack = FALSE; + } ++ else if (strcmp (optarg, "execheap") == 0) ++ { ++ link_info.execheap = TRUE; ++ link_info.noexecheap = FALSE; ++ } ++ else if (strcmp (optarg, "noexecheap") == 0) ++ { ++ link_info.noexecheap = TRUE; ++ link_info.execheap = FALSE; ++ } + EOF + if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then + fragment <<EOF +@@ -2368,6 +2378,8 @@ fragment <<EOF + -z defs Report unresolved symbols in object files.\n")); + fprintf (file, _("\ + -z execstack Mark executable as requiring executable stack\n")); ++ fprintf (file, _("\ ++ -z execheap Mark executable as requiring executable heap\n")); + EOF + + if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then +@@ -2391,6 +2403,8 @@ fragment <<EOF + fragment <<EOF + fprintf (file, _("\ + -z noexecstack Mark executable as not requiring executable stack\n")); ++ fprintf (file, _("\ ++ -z noexecheap Mark executable as not requiring executable heap\n")); + EOF + if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then + fragment <<EOF +--- binutils-2.24/ld/ldgram.y ++++ binutils-2.24/ld/ldgram.y +@@ -1119,6 +1119,8 @@ phdr_type: + $$ = exp_intop (0x6474e550); + else if (strcmp (s, "PT_GNU_STACK") == 0) + $$ = exp_intop (0x6474e551); ++ else if (strcmp (s, "PT_PAX_FLAGS") == 0) ++ $$ = exp_intop (0x65041580); + else + { + einfo (_("\ +--- binutils-2.24/ld/testsuite/ld-alpha/tlsbin.rd ++++ binutils-2.24/ld/testsuite/ld-alpha/tlsbin.rd +@@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align +- PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8 ++ PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+188 R E 0x8 + INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 + .*Requesting program interpreter.* + LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000 + LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 + DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 + TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries: +--- binutils-2.24/ld/testsuite/ld-alpha/tlsbinr.rd ++++ binutils-2.24/ld/testsuite/ld-alpha/tlsbinr.rd +@@ -42,6 +42,7 @@ Program Headers: + +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 + +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: +--- binutils-2.24/ld/testsuite/ld-alpha/tlspic.rd ++++ binutils-2.24/ld/testsuite/ld-alpha/tlspic.rd +@@ -38,6 +38,7 @@ Program Headers: + +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 + +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 + +TLS +0x0+10e0 0x0+110e0 0x0+110e0 0x0+60 0x0+80 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries: +--- binutils-2.24/ld/testsuite/ld-elf/eh1.d ++++ binutils-2.24/ld/testsuite/ld-elf/eh1.d +@@ -22,11 +22,11 @@ Contents of the .eh_frame section: + DW_CFA_nop + DW_CFA_nop + +-0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078..0+400078 +- DW_CFA_advance_loc: 0 to 0+400078 ++0+0018 0+001c 0+001c FDE cie=0+0000 pc=([0-9a-f]+)..\1 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_offset: 16 + DW_CFA_offset: r6 (rbp) at cfa-16 +- DW_CFA_advance_loc: 0 to 0+400078 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_register: r6 (rbp) + + 0+0038 ZERO terminator +--- binutils-2.24/ld/testsuite/ld-elf/eh2.d ++++ binutils-2.24/ld/testsuite/ld-elf/eh2.d +@@ -22,11 +22,11 @@ Contents of the .eh_frame section: + DW_CFA_nop + DW_CFA_nop + +-0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078..0+400078 +- DW_CFA_advance_loc: 0 to 0+400078 ++0+0018 0+001c 0+001c FDE cie=0+0000 pc=([0-9a-f]+)..\1 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_offset: 16 + DW_CFA_offset: r6 (rbp) at cfa-16 +- DW_CFA_advance_loc: 0 to 0+400078 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_register: r6 (rbp) + + 0+0038 ZERO terminator +--- binutils-2.24/ld/testsuite/ld-elf/eh3.d ++++ binutils-2.24/ld/testsuite/ld-elf/eh3.d +@@ -22,11 +22,11 @@ Contents of the .eh_frame section: + DW_CFA_nop + DW_CFA_nop + +-0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078..0+400078 +- DW_CFA_advance_loc: 0 to 0+400078 ++0+0018 0+001c 0+001c FDE cie=0+0000 pc=([0-9a-f]+)..\1 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_offset: 16 + DW_CFA_offset: r6 (rbp) at cfa-16 +- DW_CFA_advance_loc: 0 to 0+400078 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_register: r6 (rbp) + + 0+0038 ZERO terminator +--- binutils-2.24/ld/testsuite/ld-elf/orphan-region.d ++++ binutils-2.24/ld/testsuite/ld-elf/orphan-region.d +@@ -15,7 +15,9 @@ + Program Headers: + Type.* + LOAD[ \t]+0x[0-9a-f]+ 0x0*40000000 0x0*40000000 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x[0-9a-f]+ ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + Segment Sections... + 00 .text .rodata .moredata * ++ 01 + +--- binutils-2.24/ld/testsuite/ld-i386/tlsbin.rd ++++ binutils-2.24/ld/testsuite/ld-i386/tlsbin.rd +@@ -44,6 +44,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -53,6 +54,7 @@ Program Headers: + +03 +.tdata .dynamic .got .got.plt * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.24/ld/testsuite/ld-i386/tlsbindesc.rd ++++ binutils-2.24/ld/testsuite/ld-i386/tlsbindesc.rd +@@ -42,6 +42,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -51,6 +52,7 @@ Program Headers: + +03 +.tdata .dynamic .got .got.plt * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.24/ld/testsuite/ld-i386/tlsdesc.rd ++++ binutils-2.24/ld/testsuite/ld-i386/tlsdesc.rd +@@ -39,6 +39,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -46,6 +47,7 @@ Program Headers: + +01 +.tdata .dynamic .got .got.plt * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.24/ld/testsuite/ld-i386/tlsgdesc.rd ++++ binutils-2.24/ld/testsuite/ld-i386/tlsgdesc.rd +@@ -36,12 +36,14 @@ Program Headers: + +LOAD.* + +LOAD.* + +DYNAMIC.* ++ +PAX_FLAGS.* + + Section to Segment mapping: + +Segment Sections... + +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text * + +01 +.dynamic .got .got.plt * + +02 +.dynamic * ++ +03 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.24/ld/testsuite/ld-i386/tlsnopic.rd ++++ binutils-2.24/ld/testsuite/ld-i386/tlsnopic.rd +@@ -37,6 +37,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -44,6 +45,7 @@ Program Headers: + +01 +.dynamic .got .got.plt * + +02 +.dynamic * + +03 +.tbss * ++ +04 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.24/ld/testsuite/ld-i386/tlspic.rd ++++ binutils-2.24/ld/testsuite/ld-i386/tlspic.rd +@@ -40,6 +40,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -47,6 +48,7 @@ Program Headers: + +01 +.tdata .dynamic .got .got.plt * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.24/ld/testsuite/ld-ia64/merge1.d ++++ binutils-2.24/ld/testsuite/ld-ia64/merge1.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+1e0 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 c0 04 00 48 00 addl r12=24,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.24/ld/testsuite/ld-ia64/merge2.d ++++ binutils-2.24/ld/testsuite/ld-ia64/merge2.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+1e0 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 c0 04 00 48 00 addl r12=24,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.24/ld/testsuite/ld-ia64/merge3.d ++++ binutils-2.24/ld/testsuite/ld-ia64/merge3.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+210 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.24/ld/testsuite/ld-ia64/merge4.d ++++ binutils-2.24/ld/testsuite/ld-ia64/merge4.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+240 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.24/ld/testsuite/ld-ia64/merge5.d ++++ binutils-2.24/ld/testsuite/ld-ia64/merge5.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+270 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 [MMI] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.24/ld/testsuite/ld-ia64/tlsbin.rd ++++ binutils-2.24/ld/testsuite/ld-ia64/tlsbin.rd +@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align +- +PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8 +- +INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 ++ +PHDR +0x0+40 0x40+40 0x40+40 (0x[0-9a-f]+) \1 R E 0x8 ++ +INTERP +0x0+([0-9a-f]+) (0x40+\1) \2 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 + .*Requesting program interpreter.* + +LOAD +0x0+ 0x40+ 0x40+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ R E 0x10000 + +LOAD +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000 + +DYNAMIC +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+150 0x0+150 RW +0x8 + +TLS +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+60 0x0+a0 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + +IA_64_UNWIND .* R +0x8 + #... + +--- binutils-2.24/ld/testsuite/ld-ia64/tlspic.rd ++++ binutils-2.24/ld/testsuite/ld-ia64/tlspic.rd +@@ -40,6 +40,7 @@ Program Headers: + +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000 + +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8 + +TLS +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+60 0x0+80 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8 + #... + +--- binutils-2.24/ld/testsuite/ld-mips-elf/multi-got-no-shared.d ++++ binutils-2.24/ld/testsuite/ld-mips-elf/multi-got-no-shared.d +@@ -8,9 +8,9 @@ + .*: +file format.* + + Disassembly of section .text: +-004000b0 <[^>]*> 3c1c0043 lui gp,0x43 +-004000b4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 +-004000b8 <[^>]*> afbc0008 sw gp,8(sp) ++004000d0 <[^>]*> 3c1c0043 lui gp,0x43 ++004000d4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 ++004000d8 <[^>]*> afbc0008 sw gp,8(sp) + #... + 00408d60 <[^>]*> 3c1c0043 lui gp,0x43 + 00408d64 <[^>]*> 279c2c98 addiu gp,gp,11416 +--- binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd ++++ binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd +@@ -1,7 +1,7 @@ + + Elf file type is DYN (Shared object file) + Entry point .* +-There are 5 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -9,6 +9,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.* + * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -18,3 +19,4 @@ Program Headers: + *0*2 * .data .got * + *0*3 * .dynamic * + *0*4 * ++ *0*5 * +--- binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd ++++ binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC (Executable file) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 *.got .data * + *0*6 *.dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd ++++ binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC (Executable file) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 * .got .data .bss * + *0*6 * .dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd ++++ binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC (Executable file) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 * .got .data .bss * + *0*6 * .dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd ++++ binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC (Executable file) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 * .got .data .bss * + *0*6 * .dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd ++++ binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC (Executable file) + Entry point 0x44000 +-There are 7 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -12,6 +12,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -23,3 +24,4 @@ Program Headers: + *0*4 * .got .data .bss * + *0*5 * .dynamic * + *0*6 * ++ *0*7 * +--- binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd ++++ binutils-2.24/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC (Executable file) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 * .got .data .bss * + *0*6 * .dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.24/ld/testsuite/ld-powerpc/tlsexe32.r ++++ binutils-2.24/ld/testsuite/ld-powerpc/tlsexe32.r +@@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align +- +PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4 +- +INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1 ++ +PHDR +0x000034 0x01800034 0x01800034 (0x000[0-9a-f]{2}) \1 R E 0x4 ++ +INTERP +0x000([0-9a-f]{3}) 0x01800\1 0x01800\1 0x00011 0x00011 R +0x1 + +[Requesting program interpreter: .*] + +LOAD .* R E 0x10000 + +LOAD .* RWE 0x10000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0001c 0x00038 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -49,6 +50,7 @@ Program Headers: + +03 +.tdata .dynamic .got .plt + +04 +.dynamic + +05 +.tdata .tbss ++ +06 + + + Relocation section '.rela.dyn' at offset .* contains 2 entries: + Offset +Info +Type +Sym. Value +Symbol's Name + Addend +--- binutils-2.24/ld/testsuite/ld-powerpc/tlsso32.r ++++ binutils-2.24/ld/testsuite/ld-powerpc/tlsso32.r +@@ -35,6 +35,7 @@ Program Headers: + +LOAD .* RWE 0x10000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+1c 0x0+38 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -42,6 +43,7 @@ Program Headers: + +01 +.tdata .dynamic .got .plt + +02 +.dynamic + +03 +.tdata .tbss ++ +04 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 18 entries: + Offset +Info +Type +Sym. Value +Symbol's Name + Addend +@@ -52,9 +54,9 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 18 entries: + [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 + 0 + [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 + 0 + [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 + 0 +-[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +.tdata + 103e4 +-[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +.tdata + 103e8 +-[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +.tdata + 103e8 ++[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +.tdata + 10[0-9a-f]{3} ++[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +.tdata + 10[0-9a-f]{3} ++[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +.tdata + 10[0-9a-f]{3} + [0-9a-f ]+R_PPC_DTPMOD32 +0 + [0-9a-f ]+R_PPC_DTPREL32 +0 + [0-9a-f ]+R_PPC_DTPMOD32 +0 +--- binutils-2.24/ld/testsuite/ld-s390/tlsbin.rd ++++ binutils-2.24/ld/testsuite/ld-s390/tlsbin.rd +@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + +LOAD .* RW +0x1000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+60 0x0+a0 R +0x20 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -52,6 +53,7 @@ Program Headers: + +03 +.tdata .dynamic .got * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rela.dyn' at offset .* contains 4 entries: + Offset +Info +Type +Sym.Value +Sym. Name + Addend +--- binutils-2.24/ld/testsuite/ld-s390/tlsbin_64.rd ++++ binutils-2.24/ld/testsuite/ld-s390/tlsbin_64.rd +@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + +LOAD .* RW +0x1000 + +DYNAMIC .* RW +0x8 + +TLS .* 0x0+60 0x0+a0 R +0x20 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -52,6 +53,7 @@ Program Headers: + +03 +.tdata .dynamic .got * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name + Addend +--- binutils-2.24/ld/testsuite/ld-s390/tlspic.rd ++++ binutils-2.24/ld/testsuite/ld-s390/tlspic.rd +@@ -39,6 +39,7 @@ Program Headers: + +LOAD .* RW +0x1000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+60 0x0+80 R +0x20 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -46,6 +47,7 @@ Program Headers: + +01 +.tdata .dynamic .got + +02 +.dynamic + +03 +.tdata .tbss ++ +04 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: + Offset +Info +Type +Sym.Value +Sym. Name + Addend +--- binutils-2.24/ld/testsuite/ld-s390/tlspic_64.rd ++++ binutils-2.24/ld/testsuite/ld-s390/tlspic_64.rd +@@ -39,6 +39,7 @@ Program Headers: + +LOAD .* RW +0x1000 + +DYNAMIC .* RW +0x8 + +TLS .* 0x0+60 0x0+80 R +0x20 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -46,6 +47,7 @@ Program Headers: + +01 +.tdata .dynamic .got * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name + Addend +--- binutils-2.24/ld/testsuite/ld-sh/tlsbin-2.d ++++ binutils-2.24/ld/testsuite/ld-sh/tlsbin-2.d +@@ -44,6 +44,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+28 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -53,6 +54,7 @@ Program Headers: + +03 +.tdata .dynamic .got * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: + Offset +Info +Type +Sym.Value +Sym. Name + Addend +--- binutils-2.24/ld/testsuite/ld-sh/tlspic-2.d ++++ binutils-2.24/ld/testsuite/ld-sh/tlspic-2.d +@@ -32,7 +32,7 @@ Key to Flags: + + Elf file type is DYN (Shared object file) + Entry point 0x[0-9a-f]+ +-There are 4 program headers, starting at offset [0-9]+ ++There are [0-9] program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align +@@ -40,6 +40,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS .* 0x0+18 0x0+20 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -47,6 +48,7 @@ Program Headers: + +01 +.tdata .dynamic .got * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 10 entries: + Offset +Info +Type +Sym.Value +Sym. Name + Addend +--- binutils-2.24/ld/testsuite/ld-sparc/gotop32.rd ++++ binutils-2.24/ld/testsuite/ld-sparc/gotop32.rd +@@ -31,6 +31,7 @@ Program Headers: + +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000 + +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000 + +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+70 0x0+70 RW +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: +--- binutils-2.24/ld/testsuite/ld-sparc/gotop64.rd ++++ binutils-2.24/ld/testsuite/ld-sparc/gotop64.rd +@@ -31,6 +31,7 @@ Program Headers: + +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000 + +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000 + +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+e0 0x0+e0 RW +0x8 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: +--- binutils-2.24/ld/testsuite/ld-sparc/tlssunbin32.rd ++++ binutils-2.24/ld/testsuite/ld-sparc/tlssunbin32.rd +@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align +- +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4 +- +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1 ++ +PHDR +0x0+34 0x0+10034 0x0+10034 (0x[0-9a-f]+) \1 R E 0x4 ++ +INTERP +(0x[0-9a-f]+ ){3}0x0+11 0x0+11 R +0x1 + .*Requesting program interpreter.* + +LOAD .* R E 0x10000 + +LOAD .* RW +0x10000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+1060 0x0+10a0 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: +--- binutils-2.24/ld/testsuite/ld-sparc/tlssunbin64.rd ++++ binutils-2.24/ld/testsuite/ld-sparc/tlssunbin64.rd +@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align +- +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8 +- +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1 ++ +PHDR +0x0+40 0x0+100040 0x0+100040 (0x[0-9a-f]+) \1 R E 0x8 ++ +INTERP +0x0+([0-9a-f]+) (0x0+10+\1) \2 0x0+19 0x0+19 R +0x1 + .*Requesting program interpreter.* + +LOAD .* R E 0x100000 + +LOAD .* RW +0x100000 + +DYNAMIC .* RW +0x8 + +TLS .* 0x0+60 0x0+a0 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: +--- binutils-2.24/ld/testsuite/ld-sparc/tlssunnopic32.rd ++++ binutils-2.24/ld/testsuite/ld-sparc/tlssunnopic32.rd +@@ -32,6 +32,7 @@ Program Headers: + +LOAD .* RW +0x10000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+ 0x0+24 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries: +--- binutils-2.24/ld/testsuite/ld-sparc/tlssunnopic64.rd ++++ binutils-2.24/ld/testsuite/ld-sparc/tlssunnopic64.rd +@@ -32,6 +32,7 @@ Program Headers: + +LOAD .* RW +0x100000 + +DYNAMIC .* RW +0x8 + +TLS .* 0x0+ 0x0+24 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: +--- binutils-2.24/ld/testsuite/ld-sparc/tlssunpic32.rd ++++ binutils-2.24/ld/testsuite/ld-sparc/tlssunpic32.rd +@@ -36,6 +36,7 @@ Program Headers: + +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000 + +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4 + +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: +--- binutils-2.24/ld/testsuite/ld-sparc/tlssunpic64.rd ++++ binutils-2.24/ld/testsuite/ld-sparc/tlssunpic64.rd +@@ -36,6 +36,7 @@ Program Headers: + +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000 + +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8 + +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+60 0x0+80 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: +--- binutils-2.24/ld/testsuite/ld-x86-64/tlsgdesc.rd ++++ binutils-2.24/ld/testsuite/ld-x86-64/tlsgdesc.rd +@@ -36,12 +36,14 @@ Program Headers: + +LOAD.* + +LOAD.* + +DYNAMIC.* ++ +PAX_FLAGS.* + + Section to Segment mapping: + +Segment Sections... + +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text * + +01 +.dynamic .got .got.plt * + +02 +.dynamic * ++ +03 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name + Addend +--- binutils-2.24/ld/testsuite/ld-x86-64/tlspic.rd ++++ binutils-2.24/ld/testsuite/ld-x86-64/tlspic.rd +@@ -40,6 +40,7 @@ Program Headers: + +LOAD +0x0+131a 0x0+20131a 0x0+20131a 0x0+246 0x0+246 RW +0x200000 + +DYNAMIC +0x0+1380 0x0+201380 0x0+201380 0x0+130 0x0+130 RW +0x8 + +TLS +0x0+131a 0x0+20131a 0x0+20131a 0x0+60 0x0+80 R +0x1 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -47,6 +48,7 @@ Program Headers: + +01 +.tdata .dynamic .got .got.plt * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name + Addend diff --git a/binutils/patches/binutils-2.24-set-section-macros.patch0 b/binutils/patches/binutils-2.24-set-section-macros.patch0 new file mode 100644 index 0000000..6171c48 --- /dev/null +++ b/binutils/patches/binutils-2.24-set-section-macros.patch0 @@ -0,0 +1,103 @@ +diff -rcp ../binutils-2.24.orig/bfd/bfd-in2.h bfd/bfd-in2.h +*** ../binutils-2.24.orig/bfd/bfd-in2.h 2014-04-22 12:03:35.226872578 +0100 +--- bfd/bfd-in2.h 2014-04-22 12:07:51.556393678 +0100 +*************** typedef struct bfd_section *sec_ptr; +*** 294,302 **** + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +- #define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +- #define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +- #define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +--- 294,299 ---- +*************** struct relax_table { +*** 1592,1597 **** +--- 1589,1620 ---- + int size; + }; + ++ /* Note: the following are provided as inline functions rather than macros ++ because not all callers use the return value. A macro implementation ++ would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++ compilers will complain about comma expressions that have no effect. */ ++ static inline bfd_boolean ++ bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++ { ++ ptr->userdata = val; ++ return TRUE; ++ } ++ ++ static inline bfd_boolean ++ bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++ { ++ ptr->vma = ptr->lma = val; ++ ptr->user_set_vma = TRUE; ++ return TRUE; ++ } ++ ++ static inline bfd_boolean ++ bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++ { ++ ptr->alignment_power = val; ++ return TRUE; ++ } ++ + /* These sections are global, and are managed by BFD. The application + and target back end are not permitted to change the values in + these sections. */ +diff -rcp ../binutils-2.24.orig/bfd/bfd-in.h bfd/bfd-in.h +*** ../binutils-2.24.orig/bfd/bfd-in.h 2014-04-22 12:03:35.272868967 +0100 +--- bfd/bfd-in.h 2014-04-22 12:06:12.850914084 +0100 +*************** typedef struct bfd_section *sec_ptr; +*** 287,295 **** + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +- #define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +- #define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +- #define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +--- 287,292 ---- +diff -rcp ../binutils-2.24.orig/bfd/section.c bfd/section.c +*** ../binutils-2.24.orig/bfd/section.c 2014-04-22 12:03:35.215873442 +0100 +--- bfd/section.c 2014-04-22 12:06:55.795118059 +0100 +*************** CODE_FRAGMENT +*** 542,547 **** +--- 542,573 ---- + . int size; + .}; + . ++ .{* Note: the following are provided as inline functions rather than macros ++ . because not all callers use the return value. A macro implementation ++ . would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++ . compilers will complain about comma expressions that have no effect. *} ++ .static inline bfd_boolean ++ .bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++ .{ ++ . ptr->userdata = val; ++ . return TRUE; ++ .} ++ . ++ .static inline bfd_boolean ++ .bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++ .{ ++ . ptr->vma = ptr->lma = val; ++ . ptr->user_set_vma = TRUE; ++ . return TRUE; ++ .} ++ . ++ .static inline bfd_boolean ++ .bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++ .{ ++ . ptr->alignment_power = val; ++ . return TRUE; ++ .} ++ . + .{* These sections are global, and are managed by BFD. The application + . and target back end are not permitted to change the values in + . these sections. *} diff --git a/binutils/patches/binutils-2.24-symbol-warning.patch b/binutils/patches/binutils-2.24-symbol-warning.patch new file mode 100644 index 0000000..aff6c48 --- /dev/null +++ b/binutils/patches/binutils-2.24-symbol-warning.patch @@ -0,0 +1,114 @@ +From 4c6d802e592b3762a149c343bc5722e065e57841 Mon Sep 17 00:00:00 2001 +From: H.J. Lu hjl.tools@gmail.com +Date: Wed, 26 Mar 2014 12:18:59 -0700 +Subject: [PATCH] Scan all input files for symbol reference warning + +This patch scans all input files for symbol reference warning if the +symbol reference doesn't exist in the current input file. + +ld/ + + PR ld/16756 + * ldmain.c (symbol_warning): New function. + (warning_callback): Use it. Scan all input files for a reference + to SYMBOL. + +ld/testsuite/ + + PR ld/16756 + * ld-plugin/lto.exp: Expect filename and line number for PR + ld/12760 test. +--- + ld/ChangeLog | 7 ++++ + ld/ldmain.c | 43 ++++++++++++++++---------- + ld/testsuite/ChangeLog | 64 ++++++++++++++++++++++------------------ + ld/testsuite/ld-plugin/lto.exp | 4 +- + 4 files changed, 70 insertions(+), 48 deletions(-) + +diff --git a/ld/ldmain.c b/ld/ldmain.c +index ffc9f84..14253a6 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -1150,6 +1150,25 @@ struct warning_callback_info + asymbol **asymbols; + }; + ++/* Look through the relocs to see if we can find a plausible address ++ for SYMBOL in ABFD. Return TRUE if found. Otherwise return FALSE. */ ++ ++static bfd_boolean ++symbol_warning (const char *warning, const char *symbol, bfd *abfd) ++{ ++ struct warning_callback_info cinfo; ++ ++ if (!bfd_generic_link_read_symbols (abfd)) ++ einfo (_("%B%F: could not read symbols: %E\n"), abfd); ++ ++ cinfo.found = FALSE; ++ cinfo.warning = warning; ++ cinfo.symbol = symbol; ++ cinfo.asymbols = bfd_get_outsymbols (abfd); ++ bfd_map_over_sections (abfd, warning_find_reloc, &cinfo); ++ return cinfo.found; ++} ++ + /* This is called when there is a reference to a warning symbol. */ + + static bfd_boolean +--- a/ld/ldmain.c 2014-06-24 14:04:00.700594584 -0400 ++++ b/ld/ldmain.c 2014-06-24 14:07:19.452270808 -0400 +@@ -1172,24 +1172,14 @@ + einfo ("%P: %s%s\n", _("warning: "), warning); + else if (symbol == NULL) + einfo ("%B: %s%s\n", abfd, _("warning: "), warning); +- else if ((abfd->flags & BFD_PLUGIN) == 0) ++ else if (! symbol_warning (warning, symbol, abfd)) + { +- struct warning_callback_info cinfo; +- +- /* Look through the relocs to see if we can find a plausible +- address. */ +- +- if (!bfd_generic_link_read_symbols (abfd)) +- einfo (_("%B%F: could not read symbols: %E\n"), abfd); +- +- cinfo.found = FALSE; +- cinfo.warning = warning; +- cinfo.symbol = symbol; +- cinfo.asymbols = bfd_get_outsymbols (abfd); +- bfd_map_over_sections (abfd, warning_find_reloc, &cinfo); +- +- if (! cinfo.found) +- einfo ("%B: %s%s\n", abfd, _("warning: "), warning); ++ bfd *b; ++ /* Search all input files for a reference to SYMBOL. */ ++ for (b = info->input_bfds; b; b = b->link_next) ++ if (b != abfd && symbol_warning (warning, symbol, b)) ++ return TRUE; ++ einfo ("%B: %s%s\n", abfd, _("warning: "), warning); + } + + return TRUE; +diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp +index af7307f..53543a6 100644 +--- a/ld/testsuite/ld-plugin/lto.exp ++++ b/ld/testsuite/ld-plugin/lto.exp +@@ -116,14 +116,14 @@ set lto_link_tests { + "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12758a.o -Wl,--start-group tmpdir/libpr12758.a -Wl,--end-group" "" + {dummy.c} {} "pr12758.exe"} + {"Build libdummy.a PR ld/12760" +- "" "" ++ "" "-g -O0" + {pr12760a.c} {} "libdummy.a"} + {"Build libpr12760.a" + "" "-flto -O2 -ffat-lto-objects" + {pr12760b.c} {} "libpr12760.a"} + {"PR ld/12760" + "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12760a.o -Wl,--start-group tmpdir/libpr12760.a -Wl,--end-group" "" +- {dummy.c} {} "pr12760.exe" "c" "warning: Bad bar"} ++ {dummy.c} {} "pr12760.exe" "c" "pr12760a.c:6: warning: Bad bar"} + {"Build libpr13183.a" + "-T" "-flto -O2 -ffat-lto-objects" + {pr13183a.c} {} "libpr13183.a"} +-- +1.7.1 diff --git a/binutils/patches/binutils-2.24-use-relro.patch b/binutils/patches/binutils-2.24-use-relro.patch new file mode 100644 index 0000000..db3276b --- /dev/null +++ b/binutils/patches/binutils-2.24-use-relro.patch @@ -0,0 +1,9 @@ +background: +http://www.airs.com/blog/archives/189 + +--- binutils/ld/ldmain.c ++++ binutils/ld/ldmain.c +@@ -293,2 +293,3 @@ main (int argc, char **argv) + link_info.combreloc = TRUE; ++ link_info.relro = TRUE; + link_info.strip_discarded = TRUE; diff --git a/binutils/patches/binutils-2.24-weak-sym-merge.patch0 b/binutils/patches/binutils-2.24-weak-sym-merge.patch0 new file mode 100644 index 0000000..0625f0d --- /dev/null +++ b/binutils/patches/binutils-2.24-weak-sym-merge.patch0 @@ -0,0 +1,22 @@ +*** ../binutils-2.24.orig/bfd/elflink.c 2014-08-15 14:12:59.933394436 +0100 +--- bfd/elflink.c 2014-08-15 14:40:54.787075416 +0100 +*************** _bfd_elf_merge_symbol (bfd *abfd, +*** 1437,1443 **** + if (!(oldbfd != NULL + && (oldbfd->flags & BFD_PLUGIN) != 0 + && (abfd->flags & BFD_PLUGIN) == 0)) +! *skip = TRUE; + + /* Merge st_other. If the symbol already has a dynamic index, + but visibility says it should not be visible, turn it into a +--- 1437,1446 ---- + if (!(oldbfd != NULL + && (oldbfd->flags & BFD_PLUGIN) != 0 + && (abfd->flags & BFD_PLUGIN) == 0)) +! { +! newdef = FALSE; +! *skip = TRUE; +! } + + /* Merge st_other. If the symbol already has a dynamic index, + but visibility says it should not be visible, turn it into a diff --git a/binutils/patches/binutils-HEAD-change-ld-notice-interface.patch b/binutils/patches/binutils-HEAD-change-ld-notice-interface.patch new file mode 100644 index 0000000..db2ea9b --- /dev/null +++ b/binutils/patches/binutils-HEAD-change-ld-notice-interface.patch @@ -0,0 +1,398 @@ +From 4613510308cea27713e8c7424b2afee9b99f6226 Mon Sep 17 00:00:00 2001 +From: Alan Modra amodra@gmail.com +Date: Tue, 12 Aug 2014 10:43:33 +0930 +Subject: [PATCH] Change ld "notice" interface for better handling of + indirect symbols + +The main aim of this change was to have non_ir_ref set correctly on +new indirect symbols. I could have added a "copy" param to the "notice" +function, so that indirect symbols could be created in plugin_notice, +but it seemed cleaner to create indirect syms earlier and pass them +rather than "string" to "notice". + +include/ + * bfdlink.h (struct bfd_link_callbacks <notice>): Remove "string" + param, add "inh". +bfd/ + * coff-aux.c (coff_m68k_aux_link_add_one_symbol): Only call "notice" + here when not calling the generic add_symbol function. Formatting. + Correct handling of indirect symbols. Update notice call. + * elflink.c (_bfd_elf_notice_as_needed): Update notice call. + * linker.c (_bfd_generic_link_add_one_symbol): Create indirect + symbols early. Update notice call. Add comments regarding weak + symbols vs. indirect. +ld/ + * ldmain.c (notice): Update args. + * plugin.c (plugin_notice): Likewise. Follow warning sym link. + Handle new indirect symbol. +--- + bfd/coff-aux.c | 62 ++++++++++++++++++++++------------------- + bfd/elflink.c | 2 +- + bfd/linker.c | 82 +++++++++++++++++++++++++++++-------------------------- + include/bfdlink.h | 13 ++++----- + ld/ldmain.c | 6 ++-- + ld/plugin.c | 33 ++++++++++++---------- + 9 files changed, 128 insertions(+), 91 deletions(-) + +diff --git a/bfd/coff-aux.c b/bfd/coff-aux.c +index e79c77a..d95b98b 100644 +--- a/bfd/coff-aux.c ++++ b/bfd/coff-aux.c +@@ -73,20 +73,17 @@ coff_m68k_aux_link_add_one_symbol (struct bfd_link_info *info, + bfd_boolean collect, + struct bfd_link_hash_entry **hashp) + { +- struct bfd_link_hash_entry *h; ++ struct bfd_link_hash_entry *h, *inh, *t; + +- if ((flags & (BSF_WARNING | BSF_CONSTRUCTOR | BSF_WEAK)) == 0 && +- !bfd_is_und_section (section) && +- !bfd_is_com_section (section)) ++ if ((flags & (BSF_WARNING | BSF_CONSTRUCTOR | BSF_WEAK)) == 0 ++ && !bfd_is_und_section (section) ++ && !bfd_is_com_section (section)) + { + /* The new symbol is a definition or an indirect definition */ + + /* This bit copied from linker.c */ + if (hashp != NULL && *hashp != NULL) +- { +- h = *hashp; +- BFD_ASSERT (strcmp (h->root.string, name) == 0); +- } ++ h = *hashp; + else + { + h = bfd_link_hash_lookup (info->hash, name, TRUE, copy, FALSE); +@@ -98,37 +95,46 @@ coff_m68k_aux_link_add_one_symbol (struct bfd_link_info *info, + } + } + +- if (info->notice_hash != (struct bfd_hash_table *) NULL +- && (bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE) +- != (struct bfd_hash_entry *) NULL)) +- { +- if (! (*info->callbacks->notice) (info, h, abfd, section, value, +- flags, string)) +- return FALSE; +- } +- + if (hashp != (struct bfd_link_hash_entry **) NULL) + *hashp = h; + /* end duplication from linker.c */ + +- if (h->type == bfd_link_hash_defined +- || h->type == bfd_link_hash_indirect) ++ t = h; ++ inh = NULL; ++ if (h->type == bfd_link_hash_indirect) + { +- asection *msec; ++ inh = h->u.i.link; ++ t = inh; ++ } + +- if (h->type == bfd_link_hash_defined) +- msec = h->u.def.section; +- else +- msec = bfd_ind_section_ptr; ++ if (t->type == bfd_link_hash_defined) ++ { ++ asection *msec = t->u.def.section; ++ bfd_boolean special = FALSE; + + if (bfd_is_abs_section (msec) && !bfd_is_abs_section (section)) + { +- h->u.def.section = section; +- h->u.def.value = value; +- return TRUE; ++ t->u.def.section = section; ++ t->u.def.value = value; ++ special = TRUE; + } + else if (bfd_is_abs_section (section) && !bfd_is_abs_section (msec)) +- return TRUE; ++ special = TRUE; ++ ++ if (special) ++ { ++ if (info->notice_all ++ || (info->notice_hash != NULL ++ && bfd_hash_lookup (info->notice_hash, name, ++ FALSE, FALSE) != NULL)) ++ { ++ if (!(*info->callbacks->notice) (info, h, inh, ++ abfd, section, value, flags)) ++ return FALSE; ++ } ++ ++ return TRUE; ++ } + } + } + +diff --git a/bfd/elflink.c b/bfd/elflink.c +index 69a87a6..de0a734 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -3299,7 +3299,7 @@ _bfd_elf_notice_as_needed (bfd *ibfd, + struct bfd_link_info *info, + enum notice_asneeded_action act) + { +- return (*info->callbacks->notice) (info, NULL, ibfd, NULL, act, 0, NULL); ++ return (*info->callbacks->notice) (info, NULL, NULL, ibfd, NULL, act, 0); + } + + /* Add symbols from an ELF object file to the linker hash table. */ +diff --git a/bfd/linker.c b/bfd/linker.c +index 1a5ecef..abdf5b0 100644 +--- a/bfd/linker.c ++++ b/bfd/linker.c +@@ -1442,13 +1442,23 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info, + { + enum link_row row; + struct bfd_link_hash_entry *h; ++ struct bfd_link_hash_entry *inh = NULL; + bfd_boolean cycle; + + BFD_ASSERT (section != NULL); + + if (bfd_is_ind_section (section) + || (flags & BSF_INDIRECT) != 0) +- row = INDR_ROW; ++ { ++ row = INDR_ROW; ++ /* Create the indirect symbol here. This is for the benefit of ++ the plugin "notice" function. ++ STRING is the name of the symbol we want to indirect to. */ ++ inh = bfd_wrapped_link_hash_lookup (abfd, info, string, TRUE, ++ copy, FALSE); ++ if (inh == NULL) ++ return FALSE; ++ } + else if ((flags & BSF_WARNING) != 0) + row = WARN_ROW; + else if ((flags & BSF_CONSTRUCTOR) != 0) +@@ -1493,8 +1503,8 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info, + || (info->notice_hash != NULL + && bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE) != NULL)) + { +- if (! (*info->callbacks->notice) (info, h, +- abfd, section, value, flags, string)) ++ if (! (*info->callbacks->notice) (info, h, inh, ++ abfd, section, value, flags)) + return FALSE; + } + +@@ -1728,44 +1738,40 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info, + return FALSE; + /* Fall through. */ + case IND: +- /* Create an indirect symbol. */ +- { +- struct bfd_link_hash_entry *inh; +- +- /* STRING is the name of the symbol we want to indirect +- to. */ +- inh = bfd_wrapped_link_hash_lookup (abfd, info, string, TRUE, +- copy, FALSE); +- if (inh == NULL) ++ if (inh->type == bfd_link_hash_indirect ++ && inh->u.i.link == h) ++ { ++ (*_bfd_error_handler) ++ (_("%B: indirect symbol `%s' to `%s' is a loop"), ++ abfd, name, string); ++ bfd_set_error (bfd_error_invalid_operation); + return FALSE; +- if (inh->type == bfd_link_hash_indirect +- && inh->u.i.link == h) +- { +- (*_bfd_error_handler) +- (_("%B: indirect symbol `%s' to `%s' is a loop"), +- abfd, name, string); +- bfd_set_error (bfd_error_invalid_operation); +- return FALSE; +- } +- if (inh->type == bfd_link_hash_new) +- { +- inh->type = bfd_link_hash_undefined; +- inh->u.undef.abfd = abfd; +- bfd_link_add_undef (info->hash, inh); +- } ++ } ++ if (inh->type == bfd_link_hash_new) ++ { ++ inh->type = bfd_link_hash_undefined; ++ inh->u.undef.abfd = abfd; ++ bfd_link_add_undef (info->hash, inh); ++ } + +- /* If the indirect symbol has been referenced, we need to +- push the reference down to the symbol we are +- referencing. */ +- if (h->type != bfd_link_hash_new) +- { +- row = UNDEF_ROW; +- cycle = TRUE; +- } ++ /* If the indirect symbol has been referenced, we need to ++ push the reference down to the symbol we are referencing. */ ++ if (h->type != bfd_link_hash_new) ++ { ++ /* ??? If inh->type == bfd_link_hash_undefweak this ++ converts inh to bfd_link_hash_undefined. */ ++ row = UNDEF_ROW; ++ cycle = TRUE; ++ } + +- h->type = bfd_link_hash_indirect; +- h->u.i.link = inh; +- } ++ h->type = bfd_link_hash_indirect; ++ h->u.i.link = inh; ++ /* Not setting h = h->u.i.link here means that when cycle is ++ set above we'll always go to REFC, and then cycle again ++ to the indirected symbol. This means that any successful ++ change of an existing symbol to indirect counts as a ++ reference. ??? That may not be correct when the existing ++ symbol was defweak. */ + break; + + case SET: +diff --git a/include/bfdlink.h b/include/bfdlink.h +index 58dba2a..125683d 100644 +--- a/include/bfdlink.h ++++ b/include/bfdlink.h +@@ -640,15 +640,14 @@ struct bfd_link_callbacks + (struct bfd_link_info *, const char *name, + bfd *abfd, asection *section, bfd_vma address); + /* A function which is called when a symbol in notice_hash is +- defined or referenced. H is the symbol. ABFD, SECTION and +- ADDRESS are the (new) value of the symbol. If SECTION is +- bfd_und_section, this is a reference. FLAGS are the symbol +- BSF_* flags. STRING is the name of the symbol to indirect to if +- the sym is indirect, or the warning string if a warning sym. */ ++ defined or referenced. H is the symbol, INH the indirect symbol ++ if applicable. ABFD, SECTION and ADDRESS are the (new) value of ++ the symbol. If SECTION is bfd_und_section, this is a reference. ++ FLAGS are the symbol BSF_* flags. */ + bfd_boolean (*notice) + (struct bfd_link_info *, struct bfd_link_hash_entry *h, +- bfd *abfd, asection *section, bfd_vma address, flagword flags, +- const char *string); ++ struct bfd_link_hash_entry *inh, ++ bfd *abfd, asection *section, bfd_vma address, flagword flags); + /* Error or warning link info message. */ + void (*einfo) + (const char *fmt, ...); +diff --git a/ld/ldmain.c b/ld/ldmain.c +index ea25afe..77235d5 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -137,7 +137,7 @@ static bfd_boolean unattached_reloc + (struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma); + static bfd_boolean notice + (struct bfd_link_info *, struct bfd_link_hash_entry *, +- bfd *, asection *, bfd_vma, flagword, const char *); ++ struct bfd_link_hash_entry *, bfd *, asection *, bfd_vma, flagword); + + static struct bfd_link_callbacks link_callbacks = + { +@@ -1461,11 +1461,11 @@ unattached_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED, + static bfd_boolean + notice (struct bfd_link_info *info, + struct bfd_link_hash_entry *h, ++ struct bfd_link_hash_entry *inh ATTRIBUTE_UNUSED, + bfd *abfd, + asection *section, + bfd_vma value, +- flagword flags ATTRIBUTE_UNUSED, +- const char *string ATTRIBUTE_UNUSED) ++ flagword flags ATTRIBUTE_UNUSED) + { + const char *name; + +diff --git a/ld/plugin.c b/ld/plugin.c +index 8d6ae05..8cca7d0 100644 +--- a/ld/plugin.c ++++ b/ld/plugin.c +@@ -127,8 +127,9 @@ static const size_t tv_header_size = ARRAY_SIZE (tv_header_tags); + + /* Forward references. */ + static bfd_boolean plugin_notice (struct bfd_link_info *, +- struct bfd_link_hash_entry *, bfd *, +- asection *, bfd_vma, flagword, const char *); ++ struct bfd_link_hash_entry *, ++ struct bfd_link_hash_entry *, ++ bfd *, asection *, bfd_vma, flagword); + + #if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H) + +@@ -962,16 +963,21 @@ plugin_call_cleanup (void) + static bfd_boolean + plugin_notice (struct bfd_link_info *info, + struct bfd_link_hash_entry *h, ++ struct bfd_link_hash_entry *inh, + bfd *abfd, + asection *section, + bfd_vma value, +- flagword flags, +- const char *string) ++ flagword flags) + { ++ struct bfd_link_hash_entry *orig_h = h; ++ + if (h != NULL) + { + bfd *sym_bfd; + ++ if (h->type == bfd_link_hash_warning) ++ h = h->u.i.link; ++ + /* Nothing to do here if this def/ref is from an IR dummy BFD. */ + if (is_ir_dummy_bfd (abfd)) + ; +@@ -981,16 +987,15 @@ plugin_notice (struct bfd_link_info *info, + else if (bfd_is_ind_section (section) + || (flags & BSF_INDIRECT) != 0) + { ++ /* ??? Some of this is questionable. See comments in ++ _bfd_generic_link_add_one_symbol for case IND. */ + if (h->type != bfd_link_hash_new) + { +- struct bfd_link_hash_entry *inh; +- + h->non_ir_ref = TRUE; +- inh = bfd_wrapped_link_hash_lookup (abfd, info, string, FALSE, +- FALSE, FALSE); +- if (inh != NULL) +- inh->non_ir_ref = TRUE; ++ inh->non_ir_ref = TRUE; + } ++ else if (inh->type == bfd_link_hash_new) ++ inh->non_ir_ref = TRUE; + } + + /* Nothing to do here for warning symbols. */ +@@ -1031,13 +1036,13 @@ plugin_notice (struct bfd_link_info *info, + } + + /* Continue with cref/nocrossref/trace-sym processing. */ +- if (h == NULL ++ if (orig_h == NULL + || orig_notice_all + || (info->notice_hash != NULL +- && bfd_hash_lookup (info->notice_hash, h->root.string, ++ && bfd_hash_lookup (info->notice_hash, orig_h->root.string, + FALSE, FALSE) != NULL)) +- return (*orig_callbacks->notice) (info, h, +- abfd, section, value, flags, string); ++ return (*orig_callbacks->notice) (info, orig_h, inh, ++ abfd, section, value, flags); + return TRUE; + } + +-- +1.9.3 + diff --git a/cloog-ppl/cloog-ppl.nm b/cloog-ppl/cloog-ppl.nm deleted file mode 100644 index 9fed814..0000000 --- a/cloog-ppl/cloog-ppl.nm +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = cloog-ppl -version = 0.15.11 -release = 2 - -maintainer = Michael Tremer michael.tremer@ipfire.org -groups = System/Libraries -url = http://www.cloog.org -license = GPLv2+ -summary = The Chunky Loop Generator. - -description - CLooG is a software which generates loops for scanning Z-polyhedra. That is, \ - CLooG finds the code or pseudo-code where each integral point of one or more \ - parametrized polyhedron or parametrized polyhedra union is reached. CLooG is \ - designed to avoid control overhead and to produce a very efficient code. -end - -source_dl += ftp://gcc.gnu.org/pub/gcc/infrastructure/ - -build - requires - autoconf - automake - gmp-devel >= 4.1.3 - m4 - ppl-devel >= 1.0 - texinfo >= 4.13 - end - - configure_options += \ - --with-ppl - - prepare_cmds - ./autogen.sh - end - - test - make check - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch b/cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch deleted file mode 100644 index d0a2adc..0000000 --- a/cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up cloog-ppl-0.15.11/configure.in.verfix cloog-ppl-0.15.11/configure.in ---- cloog-ppl-0.15.11/configure.in.verfix 2012-12-03 16:46:17.295807008 -0500 -+++ cloog-ppl-0.15.11/configure.in 2012-12-03 16:46:59.010827161 -0500 -@@ -338,7 +338,7 @@ if test "x$with_ppl" != "x" -a "x$with_p - - AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) - AC_TRY_COMPILE([#include "ppl_c.h"],[ -- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 -+ #if (PPL_VERSION_MAJOR != 1) || (PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10) - choke me - #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) -diff -up cloog-ppl-0.15.11/configure.verfix cloog-ppl-0.15.11/configure ---- cloog-ppl-0.15.11/configure.verfix 2012-12-03 16:47:21.996837121 -0500 -+++ cloog-ppl-0.15.11/configure 2012-12-03 16:47:34.893842170 -0500 -@@ -11222,7 +11222,7 @@ int - main () - { - -- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 -+ #if (PPL_VERSION_MAJOR != 1) || (PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10) - choke me - #endif - diff --git a/cloog/cloog.nm b/cloog/cloog.nm new file mode 100644 index 0000000..ad1de92 --- /dev/null +++ b/cloog/cloog.nm @@ -0,0 +1,49 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = cloog +version = 0.18.1 +release = 1 + +groups = System/Libraries +url = http://www.bastoul.net/cloog/ +license = GPL +summary = Library that generates loops for scanning polyhedra + +description + CLooG is a software which generates loops for scanning Z-polyhedra. + That is, CLooG finds the code or pseudo-code where each integral point + of one or more parametrized polyhedron or parametrized polyhedra union + is reached. CLooG is designed to avoid control overhead and to produce + a very efficient code. +end + +source_dl += http://www.bastoul.net/cloog/pages/download/ + +build + requires + gmp-devel + isl-devel + end + + configure_options += \ + --with-isl=system + + test + make check + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/compat-cloog-ppl/compat-cloog-ppl.nm b/compat-cloog-ppl/compat-cloog-ppl.nm new file mode 100644 index 0000000..42511e6 --- /dev/null +++ b/compat-cloog-ppl/compat-cloog-ppl.nm @@ -0,0 +1,69 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = compat-cloog-ppl +version = 0.15.11 +release = 2 +thisapp = cloog-ppl-%{version} + +maintainer = Michael Tremer michael.tremer@ipfire.org +groups = System/Libraries +url = http://www.cloog.org +license = GPLv2+ +summary = The Chunky Loop Generator + +description + CLooG is a software which generates loops for scanning Z-polyhedra. + That is, CLooG finds the code or pseudo-code where each integral point + of one or more parametrized polyhedron or parametrized polyhedra union + is reached. CLooG is designed to avoid control overhead and to produce + a very efficient code. +end + +source_dl += ftp://gcc.gnu.org/pub/gcc/infrastructure/ + +build + requires + autoconf + automake + gmp-devel >= 4.1.3 + m4 + ppl-devel >= 1.0 + texinfo >= 4.13 + end + + configure_options += \ + --with-ppl + + prepare_cmds + ./autogen.sh + end + + test + make check + end + + install + mkdir -pv %{BUILDROOT}%{libdir} + install -v -m 755 .libs/libcloog.so.0.0.0 %{BUILDROOT}%{libdir} + ln -svf libcloog.so.0.0.0 %{BUILDROOT}%{libdir}/libcloog.so.0 + end +end + +packages + package %{name} + provides + cloog-ppl = %{thisver} + end + + obsoletes + cloog-ppl <= %{thisver} + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/compat-cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch b/compat-cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch new file mode 100644 index 0000000..d0a2adc --- /dev/null +++ b/compat-cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch @@ -0,0 +1,24 @@ +diff -up cloog-ppl-0.15.11/configure.in.verfix cloog-ppl-0.15.11/configure.in +--- cloog-ppl-0.15.11/configure.in.verfix 2012-12-03 16:46:17.295807008 -0500 ++++ cloog-ppl-0.15.11/configure.in 2012-12-03 16:46:59.010827161 -0500 +@@ -338,7 +338,7 @@ if test "x$with_ppl" != "x" -a "x$with_p + + AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) + AC_TRY_COMPILE([#include "ppl_c.h"],[ +- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 ++ #if (PPL_VERSION_MAJOR != 1) || (PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10) + choke me + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) +diff -up cloog-ppl-0.15.11/configure.verfix cloog-ppl-0.15.11/configure +--- cloog-ppl-0.15.11/configure.verfix 2012-12-03 16:47:21.996837121 -0500 ++++ cloog-ppl-0.15.11/configure 2012-12-03 16:47:34.893842170 -0500 +@@ -11222,7 +11222,7 @@ int + main () + { + +- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 ++ #if (PPL_VERSION_MAJOR != 1) || (PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10) + choke me + #endif + diff --git a/isl/isl.nm b/isl/isl.nm new file mode 100644 index 0000000..8c758ca --- /dev/null +++ b/isl/isl.nm @@ -0,0 +1,53 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = isl +version = 0.12.2 +release = 1 + +groups = System/Libraries +url = http://isl.gforge.inria.fr/ +license = MIT +summary = Integer Set Library + +description + isl is a library for manipulating sets and relations of integer points + bounded by linear constraints. Supported operations on sets include + intersection, union, set difference, emptiness check, convex hull, + (integer) affine hull, integer projection, computing the lexicographic + minimum using parametric integer programming, coalescing and parametric + vertex enumeration. +end + +source_dl += http://isl.gforge.inria.fr/ +sources = %{thisapp}.tar.lzma + +build + requires + gmp-devel + end + + test + make check + end + + install_cmds + install -dm755 %{BUILDROOT}/usr/share/gdb/auto-load/%{libdir} + mv -v %{BUILDROOT}%{libdir}/libisl.so.*-gdb.py \ + %{BUILDROOT}%{datadir}/gdb/auto-load/%{libdir} + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end hooks/post-receive -- IPFire 3.x development tree