cleanup PT_GNU_STACK size handling
Nathan Sidwell
nathan_sidwell@mentor.com
Mon Oct 22 12:03:00 GMT 2012
On 10/22/12 03:04, Alan Modra wrote:
> On Tue, Oct 16, 2012 at 03:45:37PM +0100, Nathan Sidwell wrote:
>> + /* For default_execstack to trigger without an explicit
>> + stack size, there must be an input note section. */
> Nope. The default triggers on the *absence* of a note section. Also,
> why scan object files when given an explicit -z execstack? I find
> your "clean up" here quite the opposite. The rest of the patch looks
Ah, I see I'd got confused by default_execstack's semantics. For it to apply
there has to be one input bfd with a note and one section without a note. I've
fixed that up, using the existing algorithm. As for the scanning with an
explicit execstack, I can't recall what I was thinking there, so I've changed
that part to not scan.
> OK, except for this copied code in bfd_elf_stack_segment_size which
> probably ought to also check for bfd_link_hash_defweak
>> + if (h && h->root.type == bfd_link_hash_defined && h->def_regular
>> + && (h->type == STT_NOTYPE || h->type == STT_OBJECT))
> and bfd_link_hash_undefweak here too
>> + /* Provide the legacy symbol, if it is referenced. */
>> + if (h && h->root.type == bfd_link_hash_undefined)
done.
On 10/22/12 05:01, Mike Frysinger wrote:
>> Actually,
>> it doesn't work, because such a defsym gets a type NOTYPE and the check in
>> always_size_sections for 'h->type == STT_OBJECT' fails. One ends up with
>> a duplicate symbol error. I have no idea how long that's been broken.
>
> hmm, it works on Blackfin:
Well ld-sh/fdpic-stack-size.d didn't. Clearly some kind of divergence --
cut-n-paste, bad.
> style wise, there's a bunch of places that have trailing whitespace. might
> want to double check & clean that up. elf-bfd.h and bfd/elf.c pop out wrt
> that.
Fixed, along with your other nits.
>> + (const char *) NULL, FALSE,
>
> do you really need to cast that ?
Hey, I just cut and pasted that from the bfin backend. <ducks>.
Retested as before, ok?
nathan
--
Nathan Sidwell
-------------- next part --------------
2012-10-22 Nathan Sidwell <nathan@codesourcery.com>
bfd/
* bfd-in.h (bfd_elf_stack_segment_size): Declare.
* bfd-in2.h: Rebuilt.
* elfxx-target.h (elf_backend_stack_align): New.
(elfNN_bed): Add it.
* elf-bfd.h (struct elf_backend_data): Add stack_align field.
* elf.c (bfd_elf_map_sections_to_segments): Pay attention to
stack_align and stacksize for PT_GNU_STACK segment.
(assign_file_positions_for_non_load_sections): Set p_memsz for
PT_GNU_STACK segment.
(copy_elf_program_header): Copy PT_GNU_STACK size.
* elflink.c (bfd_elf_stack_segment_size): New function, taken from
uclinux backends.
(bfd_elf_size_dynamic_sections): Determine
PT_GNU_STACK requirements after calling backend. Pay attention to
stacksize.
* elf32-bfin.c (elf32_bfinfdpic_always_size_sections): Call
bfd_elf_stack_segment_size.
(elf32_bfinfdpic_modify_program_headers): Delete.
(elf32_bfingfdpic_copy_private_bfd_data): Don't copy PT_GNU_STACK
here.
(elf_backend_stack_align): Override.
(elf_backend_modify_program_headers): Don't override.
* elf32-frv.c (frvfdpic_always_size_sections): Call
bfd_elf_stack_segment_size.
(elf32_frvfdpic_modify_program_headers): Delete.
(elf32_frvfdpic_copy_private_bfd_data): Don't copy PT_GNU_STACK
here.
(elf_backend_stack_align): Override.
(elf_backend_modify_program_headers): Don't override.
* elf32-lm32.c (lm32_elf_always_size_sections): Leave
PT_GNU_STACK creation to underlying elf support. Check
__stacksize here for backwards compatibility, and set it if
needed.
(lm32_elf_modify_segment_map): Delete.
(lm32_elf_modify_program_headers): Delete.
(elf_backend_stack_align): Override.
(elf_backend_modify_segment_map): Don't override.
(elf_backend_modify_program_headers): Don't override.
* elf32-sh.c (sh_elf_always_size_sections): Call
bfd_elf_stack_segment_size.
(sh_elf_modify_program_headers): Delete.
(sh_elf_copy_private_data): Don't copy PT_GNU_STACK
here.
(elf_backend_stack_align): Override.
(elf_backend_modify_program_headers): Don't override.
* elf32-tic6x.c (elf32_tic6x_always_size_sections): Call
bfd_elf_stack_segment_size.
(elf32_tic6x_modify_program_headers): Delete.
(elf32_tic6x_copy_private_data): Delete.
(elf_backend_stack_align): Override.
(bfd_elf32_bfd_copy_private_bfd_data): Don't override.
(elf_backend_modify_program_headers): Don't override.
include/
* bfdlink.h (struct bfd_link_info): Add stacksize option.
ld/
* ld.texinfo (stack-size): New option.
* emultempl/elf32.em: Add stack-size option.
ld/testsuite/
* ld-elf/binutils.exp: Add -z stack-size=0.
* ld-elf/elf.exp: Add stack-exec and stack-size tests.
* ld-elf/orphan-region.d: Add stack-size and no-exec
options. Remove xfail.
* ld-elf/stack-exec.rd: New.
* ld-elf/stack-size.rd: New.
* ld-elf/stack.s: New.
* ld-scripts/empty-aligned.d: Add stack-size and no-exec options.
* ld-sh/fdpic-stack-set.d: New.
* ld-tic6x/shlib-1.rd: Remove __stacksize symbol.
* ld-tic6x/shlib-1b.rd: Likewise.
* ld-tic6x/shlib-1r.rd: Likewise.
* ld-tic6x/shlib-1rb.rd: Likewise.
* ld-tic6x/shlib-app-1.rd: Likewise.
* ld-tic6x/shlib-app-1b.rd: Likewise.
* ld-tic6x/shlib-app-1r.rd: Likewise.
* ld-tic6x/shlib-app-1rb.rd: Likewise.
* ld-tic6x/shlib-noindex.rd: Likewise.
* ld-tic6x/static-app-1.rd: Likewise.
* ld-tic6x/static-app-1b.rd: Likewise.
* ld-tic6x/static-app-1r.rd: Likewise.
* ld-tic6x/static-app-1rb.rd: Likewise.
Index: bfd/bfd-in.h
===================================================================
RCS file: /cvs/src/src/bfd/bfd-in.h,v
retrieving revision 1.168
diff -u -3 -p -r1.168 bfd-in.h
--- bfd/bfd-in.h 13 Aug 2012 14:52:34 -0000 1.168
+++ bfd/bfd-in.h 22 Oct 2012 11:51:52 -0000
@@ -648,6 +648,8 @@ extern struct bfd_link_needed_list *bfd_
(bfd *, struct bfd_link_info *);
extern bfd_boolean bfd_elf_get_bfd_needed_list
(bfd *, struct bfd_link_needed_list **);
+extern bfd_boolean bfd_elf_stack_segment_size (bfd *, struct bfd_link_info *,
+ const char *, bfd_vma);
extern bfd_boolean bfd_elf_size_dynamic_sections
(bfd *, const char *, const char *, const char *, const char *, const char *,
const char * const *, struct bfd_link_info *, struct bfd_section **);
Index: bfd/bfd-in2.h
===================================================================
RCS file: /cvs/src/src/bfd/bfd-in2.h,v
retrieving revision 1.586
diff -u -3 -p -r1.586 bfd-in2.h
--- bfd/bfd-in2.h 13 Sep 2012 11:09:02 -0000 1.586
+++ bfd/bfd-in2.h 22 Oct 2012 11:51:54 -0000
@@ -655,6 +655,8 @@ extern struct bfd_link_needed_list *bfd_
(bfd *, struct bfd_link_info *);
extern bfd_boolean bfd_elf_get_bfd_needed_list
(bfd *, struct bfd_link_needed_list **);
+extern bfd_boolean bfd_elf_stack_segment_size (bfd *, struct bfd_link_info *,
+ const char *, bfd_vma);
extern bfd_boolean bfd_elf_size_dynamic_sections
(bfd *, const char *, const char *, const char *, const char *, const char *,
const char * const *, struct bfd_link_info *, struct bfd_section **);
Index: bfd/elf-bfd.h
===================================================================
RCS file: /cvs/src/src/bfd/elf-bfd.h,v
retrieving revision 1.347
diff -u -3 -p -r1.347 elf-bfd.h
--- bfd/elf-bfd.h 19 Sep 2012 00:53:27 -0000 1.347
+++ bfd/elf-bfd.h 22 Oct 2012 11:51:55 -0000
@@ -1285,6 +1285,9 @@ struct elf_backend_data
/* This is non-zero if static TLS segments require a special alignment. */
unsigned static_tls_alignment;
+ /* Alignment for the PT_GNU_STACK segment. */
+ unsigned stack_align;
+
/* This is TRUE if the linker should act like collect and gather
global constructors and destructors by name. This is TRUE for
MIPS ELF because the Irix 5 tools can not handle the .init
Index: bfd/elf.c
===================================================================
RCS file: /cvs/src/src/bfd/elf.c,v
retrieving revision 1.571
diff -u -3 -p -r1.571 elf.c
--- bfd/elf.c 7 Oct 2012 23:59:26 -0000 1.571
+++ bfd/elf.c 22 Oct 2012 11:51:58 -0000
@@ -4137,7 +4137,14 @@ _bfd_elf_map_sections_to_segments (bfd *
m->next = NULL;
m->p_type = PT_GNU_STACK;
m->p_flags = elf_tdata (abfd)->stack_flags;
+ m->p_align = bed->stack_align;
m->p_flags_valid = 1;
+ m->p_align_valid = m->p_align != 0;
+ if (info->stacksize > 0)
+ {
+ m->p_size = info->stacksize;
+ m->p_size_valid = 1;
+ }
*pm = m;
pm = &m->next;
@@ -5019,6 +5026,11 @@ assign_file_positions_for_non_load_secti
p->p_type = PT_NULL;
}
}
+ else if (p->p_type == PT_GNU_STACK)
+ {
+ if (m->p_size_valid)
+ p->p_memsz = m->p_size;
+ }
else if (m->count != 0)
{
if (p->p_type != PT_LOAD
@@ -6163,12 +6175,15 @@ copy_elf_program_header (bfd *ibfd, bfd
map->p_align_valid = 1;
map->p_vaddr_offset = 0;
- if (map->p_type == PT_GNU_RELRO)
+ if (map->p_type == PT_GNU_RELRO
+ || map->p_type == PT_GNU_STACK)
{
/* The PT_GNU_RELRO segment may contain the first a few
bytes in the .got.plt section even if the whole .got.plt
section isn't in the PT_GNU_RELRO segment. We won't
- change the size of the PT_GNU_RELRO segment. */
+ change the size of the PT_GNU_RELRO segment.
+ Similarly, PT_GNU_STACK size is significant on uclinux
+ systems. */
map->p_size = segment->p_memsz;
map->p_size_valid = 1;
}
Index: bfd/elf32-bfin.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-bfin.c,v
retrieving revision 1.59
diff -u -3 -p -r1.59 elf32-bfin.c
--- bfd/elf32-bfin.c 13 Jul 2012 14:22:46 -0000 1.59
+++ bfd/elf32-bfin.c 22 Oct 2012 11:52:00 -0000
@@ -4311,35 +4311,10 @@ static bfd_boolean
elf32_bfinfdpic_always_size_sections (bfd *output_bfd,
struct bfd_link_info *info)
{
- if (!info->relocatable)
- {
- struct elf_link_hash_entry *h;
-
- /* Force a PT_GNU_STACK segment to be created. */
- if (! elf_tdata (output_bfd)->stack_flags)
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-
- /* Define __stacksize if it's not defined yet. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (! h || h->root.type != bfd_link_hash_defined
- || h->type != STT_OBJECT
- || !h->def_regular)
- {
- struct bfd_link_hash_entry *bh = NULL;
-
- if (!(_bfd_generic_link_add_one_symbol
- (info, output_bfd, "__stacksize",
- BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
- (const char *) NULL, FALSE,
- get_elf_backend_data (output_bfd)->collect, &bh)))
- return FALSE;
-
- h = (struct elf_link_hash_entry *) bh;
- h->def_regular = 1;
- h->type = STT_OBJECT;
- }
- }
+ if (!info->relocatable
+ && !bfd_elf_stack_segment_size (output_bfd, info,
+ "__stacksize", DEFAULT_STACK_SIZE))
+ return FALSE;
return TRUE;
}
@@ -4460,51 +4435,6 @@ bfinfdpic_elf_discard_info (bfd *ibfd,
}
static bfd_boolean
-elf32_bfinfdpic_modify_program_headers (bfd *output_bfd,
- struct bfd_link_info *info)
-{
- struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
- struct elf_segment_map *m;
- Elf_Internal_Phdr *p;
-
- /* objcopy and strip preserve what's already there using
- elf32_bfinfdpic_copy_private_bfd_data (). */
- if (! info)
- return TRUE;
-
- for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
- if (m->p_type == PT_GNU_STACK)
- break;
-
- if (m)
- {
- struct elf_link_hash_entry *h;
-
- /* Obtain the pointer to the __stacksize symbol. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (h)
- {
- while (h->root.type == bfd_link_hash_indirect
- || h->root.type == bfd_link_hash_warning)
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
- BFD_ASSERT (h->root.type == bfd_link_hash_defined);
- }
-
- /* Set the header p_memsz from the symbol value. We
- intentionally ignore the symbol section. */
- if (h && h->root.type == bfd_link_hash_defined)
- p->p_memsz = h->root.u.def.value;
- else
- p->p_memsz = DEFAULT_STACK_SIZE;
-
- p->p_align = 8;
- }
-
- return TRUE;
-}
-
-static bfd_boolean
elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd,
struct bfd_link_info *info)
{
@@ -5017,8 +4947,6 @@ bfin_elf_copy_private_bfd_data (bfd *ibf
static bfd_boolean
elf32_bfinfdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
{
- unsigned i;
-
if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
|| bfd_get_flavour (obfd) != bfd_target_elf_flavour)
return TRUE;
@@ -5030,31 +4958,6 @@ elf32_bfinfdpic_copy_private_bfd_data (b
|| ! elf_tdata (obfd) || ! elf_tdata (obfd)->phdr)
return TRUE;
- /* Copy the stack size. */
- for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
- if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
- {
- Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
-
- for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
- if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
- {
- memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
-
- /* Rewrite the phdrs, since we're only called after they
- were first written. */
- if (bfd_seek (obfd, (bfd_signed_vma) get_elf_backend_data (obfd)
- ->s->sizeof_ehdr, SEEK_SET) != 0
- || get_elf_backend_data (obfd)->s
- ->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
- elf_elfheader (obfd)->e_phnum) != 0)
- return FALSE;
- break;
- }
-
- break;
- }
-
return TRUE;
}
@@ -5802,6 +5705,7 @@ struct bfd_elf_special_section const elf
#define elf_backend_final_write_processing \
elf32_bfin_final_write_processing
#define elf_backend_reloc_type_class elf32_bfin_reloc_type_class
+#define elf_backend_stack_align 8
#define elf_backend_can_gc_sections 1
#define elf_backend_special_sections elf32_bfin_special_sections
#define elf_backend_can_refcount 1
@@ -5837,9 +5741,6 @@ struct bfd_elf_special_section const elf
#undef elf_backend_always_size_sections
#define elf_backend_always_size_sections \
elf32_bfinfdpic_always_size_sections
-#undef elf_backend_modify_program_headers
-#define elf_backend_modify_program_headers \
- elf32_bfinfdpic_modify_program_headers
#undef bfd_elf32_bfd_copy_private_bfd_data
#define bfd_elf32_bfd_copy_private_bfd_data \
elf32_bfinfdpic_copy_private_bfd_data
Index: bfd/elf32-frv.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-frv.c,v
retrieving revision 1.78
diff -u -3 -p -r1.78 elf32-frv.c
--- bfd/elf32-frv.c 13 Jul 2012 14:22:46 -0000 1.78
+++ bfd/elf32-frv.c 22 Oct 2012 11:52:02 -0000
@@ -5494,36 +5494,10 @@ static bfd_boolean
elf32_frvfdpic_always_size_sections (bfd *output_bfd,
struct bfd_link_info *info)
{
- if (!info->relocatable)
- {
- struct elf_link_hash_entry *h;
-
- /* Force a PT_GNU_STACK segment to be created. */
- if (! elf_tdata (output_bfd)->stack_flags)
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-
- /* Define __stacksize if it's not defined yet. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (! h || h->root.type != bfd_link_hash_defined
- || h->type != STT_OBJECT
- || !h->def_regular)
- {
- struct bfd_link_hash_entry *bh = NULL;
-
- if (!(_bfd_generic_link_add_one_symbol
- (info, output_bfd, "__stacksize",
- BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
- (const char *) NULL, FALSE,
- get_elf_backend_data (output_bfd)->collect, &bh)))
- return FALSE;
-
- h = (struct elf_link_hash_entry *) bh;
- h->def_regular = 1;
- h->type = STT_OBJECT;
- /* This one must NOT be hidden. */
- }
- }
+ if (!info->relocatable
+ && !bfd_elf_stack_segment_size (output_bfd, info,
+ "__stacksize", DEFAULT_STACK_SIZE))
+ return FALSE;
return TRUE;
}
@@ -5720,51 +5694,6 @@ elf32_frvfdpic_relax_section (bfd *abfd
return TRUE;
}
-static bfd_boolean
-elf32_frvfdpic_modify_program_headers (bfd *output_bfd,
- struct bfd_link_info *info)
-{
- struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
- struct elf_segment_map *m;
- Elf_Internal_Phdr *p;
-
- /* objcopy and strip preserve what's already there using
- elf32_frvfdpic_copy_private_bfd_data (). */
- if (! info)
- return TRUE;
-
- for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
- if (m->p_type == PT_GNU_STACK)
- break;
-
- if (m)
- {
- struct elf_link_hash_entry *h;
-
- /* Obtain the pointer to the __stacksize symbol. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (h)
- {
- while (h->root.type == bfd_link_hash_indirect
- || h->root.type == bfd_link_hash_warning)
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
- BFD_ASSERT (h->root.type == bfd_link_hash_defined);
- }
-
- /* Set the header p_memsz from the symbol value. We
- intentionally ignore the symbol section. */
- if (h && h->root.type == bfd_link_hash_defined)
- p->p_memsz = h->root.u.def.value;
- else
- p->p_memsz = DEFAULT_STACK_SIZE;
-
- p->p_align = 8;
- }
-
- return TRUE;
-}
-
/* Fill in code and data in dynamic sections. */
static bfd_boolean
@@ -6431,8 +6360,6 @@ frv_elf_arch_extension_p (flagword base,
static bfd_boolean
elf32_frvfdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
{
- unsigned i;
-
if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
|| bfd_get_flavour (obfd) != bfd_target_elf_flavour)
return TRUE;
@@ -6444,31 +6371,6 @@ elf32_frvfdpic_copy_private_bfd_data (bf
|| ! elf_tdata (obfd) || ! elf_tdata (obfd)->phdr)
return TRUE;
- /* Copy the stack size. */
- for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
- if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
- {
- Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
-
- for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
- if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
- {
- memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
-
- /* Rewrite the phdrs, since we're only called after they
- were first written. */
- if (bfd_seek (obfd, (bfd_signed_vma) get_elf_backend_data (obfd)
- ->s->sizeof_ehdr, SEEK_SET) != 0
- || get_elf_backend_data (obfd)->s
- ->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
- elf_elfheader (obfd)->e_phnum) != 0)
- return FALSE;
- break;
- }
-
- break;
- }
-
return TRUE;
}
@@ -6920,6 +6822,7 @@ elf32_frv_grok_psinfo (bfd *abfd, Elf_In
#define elf_backend_object_p elf32_frv_object_p
#define elf_backend_add_symbol_hook elf32_frv_add_symbol_hook
+#define elf_backend_stack_align 8
#define elf_backend_can_gc_sections 1
#define elf_backend_rela_normal 1
@@ -6964,9 +6867,6 @@ elf32_frv_grok_psinfo (bfd *abfd, Elf_In
#undef elf_backend_always_size_sections
#define elf_backend_always_size_sections \
elf32_frvfdpic_always_size_sections
-#undef elf_backend_modify_program_headers
-#define elf_backend_modify_program_headers \
- elf32_frvfdpic_modify_program_headers
#undef bfd_elf32_bfd_copy_private_bfd_data
#define bfd_elf32_bfd_copy_private_bfd_data \
elf32_frvfdpic_copy_private_bfd_data
Index: bfd/elf32-lm32.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-lm32.c,v
retrieving revision 1.16
diff -u -3 -p -r1.16 elf32-lm32.c
--- bfd/elf32-lm32.c 2 Sep 2012 12:17:26 -0000 1.16
+++ bfd/elf32-lm32.c 22 Oct 2012 11:52:03 -0000
@@ -2615,135 +2615,22 @@ lm32_elf_copy_indirect_symbol (struct bf
}
static bfd_boolean
-lm32_elf_always_size_sections (bfd *output_bfd,
- struct bfd_link_info *info)
+lm32_elf_always_size_sections (bfd *output_bfd, struct bfd_link_info *info)
{
if (!info->relocatable)
{
- struct elf_link_hash_entry *h;
+ if (!bfd_elf_stack_segment_size (output_bfd, info,
+ "__stacksize", DEFAULT_STACK_SIZE))
+ return FALSE;
- /* Force a PT_GNU_STACK segment to be created. */
- if (! elf_tdata (output_bfd)->stack_flags)
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-
- /* Define __stacksize if it's not defined yet. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (! h || h->root.type != bfd_link_hash_defined
- || h->type != STT_OBJECT
- || !h->def_regular)
- {
- struct bfd_link_hash_entry *bh = NULL;
-
- if (!(_bfd_generic_link_add_one_symbol
- (info, output_bfd, "__stacksize",
- BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
- (const char *) NULL, FALSE,
- get_elf_backend_data (output_bfd)->collect, &bh)))
- return FALSE;
-
- h = (struct elf_link_hash_entry *) bh;
- h->def_regular = 1;
- h->type = STT_OBJECT;
- /* This one must NOT be hidden. */
- }
- }
-
- return TRUE;
-}
-
-static bfd_boolean
-lm32_elf_modify_segment_map (bfd *output_bfd,
- struct bfd_link_info *info)
-{
- struct elf_segment_map *m;
-
- /* objcopy and strip preserve what's already there using elf32_lm32fdpic_copy_
- private_bfd_data (). */
- if (! info)
- return TRUE;
-
- for (m = elf_tdata (output_bfd)->segment_map; m != NULL; m = m->next)
- if (m->p_type == PT_GNU_STACK)
- break;
-
- if (m)
- {
asection *sec = bfd_get_section_by_name (output_bfd, ".stack");
- struct elf_link_hash_entry *h;
-
if (sec)
- {
- /* Obtain the pointer to the __stacksize symbol. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- while (h->root.type == bfd_link_hash_indirect
- || h->root.type == bfd_link_hash_warning)
- h = (struct elf_link_hash_entry *)h->root.u.i.link;
- BFD_ASSERT (h->root.type == bfd_link_hash_defined);
-
- /* Set the section size from the symbol value. We
- intentionally ignore the symbol section. */
- if (h->root.type == bfd_link_hash_defined)
- sec->size = h->root.u.def.value;
- else
- sec->size = DEFAULT_STACK_SIZE;
-
- /* Add the stack section to the PT_GNU_STACK segment,
- such that its size and alignment requirements make it
- to the segment. */
- m->sections[m->count] = sec;
- m->count++;
- }
- }
-
- return TRUE;
-}
-
-static bfd_boolean
-lm32_elf_modify_program_headers (bfd *output_bfd,
- struct bfd_link_info *info)
-{
- struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
- struct elf_segment_map *m;
- Elf_Internal_Phdr *p;
-
- if (! info)
- return TRUE;
-
- for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
- if (m->p_type == PT_GNU_STACK)
- break;
-
- if (m)
- {
- struct elf_link_hash_entry *h;
-
- /* Obtain the pointer to the __stacksize symbol. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (h)
- {
- while (h->root.type == bfd_link_hash_indirect
- || h->root.type == bfd_link_hash_warning)
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
- BFD_ASSERT (h->root.type == bfd_link_hash_defined);
- }
-
- /* Set the header p_memsz from the symbol value. We
- intentionally ignore the symbol section. */
- if (h && h->root.type == bfd_link_hash_defined)
- p->p_memsz = h->root.u.def.value;
- else
- p->p_memsz = DEFAULT_STACK_SIZE;
-
- p->p_align = 8;
+ sec->size = info->stacksize >= 0 ? info->stacksize : 0;
}
return TRUE;
}
-
static bfd_boolean
lm32_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
{
@@ -2822,6 +2709,7 @@ lm32_elf_fdpic_copy_private_bfd_data (bf
#define elf_backend_rela_normal 1
#define elf_backend_object_p lm32_elf_object_p
#define elf_backend_final_write_processing lm32_elf_final_write_processing
+#define elf_backend_stack_align 8
#define elf_backend_can_gc_sections 1
#define elf_backend_can_refcount 1
#define elf_backend_gc_mark_hook lm32_elf_gc_mark_hook
@@ -2857,10 +2745,6 @@ lm32_elf_fdpic_copy_private_bfd_data (bf
#undef elf_backend_always_size_sections
#define elf_backend_always_size_sections lm32_elf_always_size_sections
-#undef elf_backend_modify_segment_map
-#define elf_backend_modify_segment_map lm32_elf_modify_segment_map
-#undef elf_backend_modify_program_headers
-#define elf_backend_modify_program_headers lm32_elf_modify_program_headers
#undef bfd_elf32_bfd_copy_private_bfd_data
#define bfd_elf32_bfd_copy_private_bfd_data lm32_elf_fdpic_copy_private_bfd_data
Index: bfd/elf32-sh.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-sh.c,v
retrieving revision 1.182
diff -u -3 -p -r1.182 elf32-sh.c
--- bfd/elf32-sh.c 2 Sep 2012 12:17:26 -0000 1.182
+++ bfd/elf32-sh.c 22 Oct 2012 11:52:05 -0000
@@ -3314,86 +3314,13 @@ sh_elf_always_size_sections (bfd *output
{
sh_elf_hash_table (info)->plt_info = get_plt_info (output_bfd, info->shared);
- if (sh_elf_hash_table (info)->fdpic_p && !info->relocatable)
- {
- struct elf_link_hash_entry *h;
-
- /* Force a PT_GNU_STACK segment to be created. */
- if (! elf_tdata (output_bfd)->stack_flags)
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-
- /* Define __stacksize if it's not defined yet. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (! h || h->root.type != bfd_link_hash_defined
- || h->type != STT_OBJECT
- || !h->def_regular)
- {
- struct bfd_link_hash_entry *bh = NULL;
-
- if (!(_bfd_generic_link_add_one_symbol
- (info, output_bfd, "__stacksize",
- BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
- (const char *) NULL, FALSE,
- get_elf_backend_data (output_bfd)->collect, &bh)))
- return FALSE;
-
- h = (struct elf_link_hash_entry *) bh;
- h->def_regular = 1;
- h->type = STT_OBJECT;
- }
- }
- return TRUE;
-}
-
-#if !defined INCLUDE_SHMEDIA && !defined SH_TARGET_ALREADY_DEFINED
-
-static bfd_boolean
-sh_elf_modify_program_headers (bfd *output_bfd, struct bfd_link_info *info)
-{
- struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
- struct elf_segment_map *m;
- Elf_Internal_Phdr *p;
-
- /* objcopy and strip preserve what's already there using
- sh_elf_copy_private_bfd_data (). */
- if (! info)
- return TRUE;
-
- for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
- if (m->p_type == PT_GNU_STACK)
- break;
-
- if (m)
- {
- struct elf_link_hash_entry *h;
-
- /* Obtain the pointer to the __stacksize symbol. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (h)
- {
- while (h->root.type == bfd_link_hash_indirect
- || h->root.type == bfd_link_hash_warning)
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
- BFD_ASSERT (h->root.type == bfd_link_hash_defined);
- }
-
- /* Set the header p_memsz from the symbol value. We
- intentionally ignore the symbol section. */
- if (h && h->root.type == bfd_link_hash_defined)
- p->p_memsz = h->root.u.def.value;
- else
- p->p_memsz = DEFAULT_STACK_SIZE;
-
- p->p_align = 8;
- }
-
+ if (sh_elf_hash_table (info)->fdpic_p && !info->relocatable
+ && !bfd_elf_stack_segment_size (output_bfd, info,
+ "__stacksize", DEFAULT_STACK_SIZE))
+ return FALSE;
return TRUE;
}
-#endif
-
/* Set the sizes of the dynamic sections. */
static bfd_boolean
@@ -6683,38 +6610,6 @@ sh_elf_copy_private_data (bfd * ibfd, bf
if (! is_sh_elf (ibfd) || ! is_sh_elf (obfd))
return TRUE;
- /* Copy the stack size. */
- if (elf_tdata (ibfd)->phdr && elf_tdata (obfd)->phdr
- && fdpic_object_p (ibfd) && fdpic_object_p (obfd))
- {
- unsigned i;
-
- for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
- if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
- {
- Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
-
- for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
- if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
- {
- memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
-
- /* Rewrite the phdrs, since we're only called after they
- were first written. */
- if (bfd_seek (obfd,
- (bfd_signed_vma) get_elf_backend_data (obfd)
- ->s->sizeof_ehdr, SEEK_SET) != 0
- || get_elf_backend_data (obfd)->s
- ->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
- elf_elfheader (obfd)->e_phnum) != 0)
- return FALSE;
- break;
- }
-
- break;
- }
- }
-
return sh_elf_set_private_flags (obfd, elf_elfheader (ibfd)->e_flags);
}
#endif /* not sh_elf_copy_private_data */
@@ -7587,6 +7482,7 @@ sh_elf_encode_eh_address (bfd *abfd,
#define elf_backend_encode_eh_address \
sh_elf_encode_eh_address
+#define elf_backend_stack_align 8
#define elf_backend_can_gc_sections 1
#define elf_backend_can_refcount 1
#define elf_backend_want_got_plt 1
@@ -7649,9 +7545,6 @@ sh_elf_encode_eh_address (bfd *abfd,
#define TARGET_LITTLE_SYM bfd_elf32_shfd_vec
#undef TARGET_LITTLE_NAME
#define TARGET_LITTLE_NAME "elf32-sh-fdpic"
-#undef elf_backend_modify_program_headers
-#define elf_backend_modify_program_headers \
- sh_elf_modify_program_headers
#undef elf32_bed
#define elf32_bed elf32_sh_fd_bed
Index: bfd/elf32-tic6x.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-tic6x.c,v
retrieving revision 1.33
diff -u -3 -p -r1.33 elf32-tic6x.c
--- bfd/elf32-tic6x.c 2 Sep 2012 12:17:26 -0000 1.33
+++ bfd/elf32-tic6x.c 22 Oct 2012 11:52:06 -0000
@@ -3520,79 +3520,10 @@ elf32_tic6x_size_dynamic_sections (bfd *
static bfd_boolean
elf32_tic6x_always_size_sections (bfd *output_bfd, struct bfd_link_info *info)
{
- if (elf32_tic6x_using_dsbt (output_bfd) && !info->relocatable)
- {
- struct elf_link_hash_entry *h;
-
- /* Force a PT_GNU_STACK segment to be created. */
- if (! elf_tdata (output_bfd)->stack_flags)
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-
- /* Define __stacksize if it's not defined yet. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (! h || h->root.type != bfd_link_hash_defined
- || h->type != STT_OBJECT
- || !h->def_regular)
- {
- struct bfd_link_hash_entry *bh = NULL;
-
- if (!(_bfd_generic_link_add_one_symbol
- (info, output_bfd, "__stacksize",
- BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
- (const char *) NULL, FALSE,
- get_elf_backend_data (output_bfd)->collect, &bh)))
- return FALSE;
-
- h = (struct elf_link_hash_entry *) bh;
- h->def_regular = 1;
- h->type = STT_OBJECT;
- }
- }
- return TRUE;
-}
-
-static bfd_boolean
-elf32_tic6x_modify_program_headers (bfd *output_bfd,
- struct bfd_link_info *info)
-{
- struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
- struct elf_segment_map *m;
- Elf_Internal_Phdr *p;
-
- /* objcopy and strip preserve what's already there using
- elf32_tic6x_copy_private_bfd_data (). */
- if (! info)
- return TRUE;
-
- for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
- if (m->p_type == PT_GNU_STACK)
- break;
-
- if (m)
- {
- struct elf_link_hash_entry *h;
-
- /* Obtain the pointer to the __stacksize symbol. */
- h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
- FALSE, FALSE, FALSE);
- if (h)
- {
- while (h->root.type == bfd_link_hash_indirect
- || h->root.type == bfd_link_hash_warning)
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
- BFD_ASSERT (h->root.type == bfd_link_hash_defined);
- }
-
- /* Set the header p_memsz from the symbol value. We
- intentionally ignore the symbol section. */
- if (h && h->root.type == bfd_link_hash_defined)
- p->p_memsz = h->root.u.def.value;
- else
- p->p_memsz = DEFAULT_STACK_SIZE;
-
- p->p_align = 8;
- }
+ if (elf32_tic6x_using_dsbt (output_bfd) && !info->relocatable
+ && !bfd_elf_stack_segment_size (output_bfd, info,
+ "__stacksize", DEFAULT_STACK_SIZE))
+ return FALSE;
return TRUE;
}
@@ -4020,49 +3951,6 @@ elf32_tic6x_merge_private_bfd_data (bfd
return TRUE;
}
-static bfd_boolean
-elf32_tic6x_copy_private_data (bfd * ibfd, bfd * obfd)
-{
- _bfd_elf_copy_private_bfd_data (ibfd, obfd);
-
- if (! is_tic6x_elf (ibfd) || ! is_tic6x_elf (obfd))
- return TRUE;
-
- /* Copy the stack size. */
- if (elf_tdata (ibfd)->phdr && elf_tdata (obfd)->phdr
- && elf32_tic6x_using_dsbt (ibfd) && elf32_tic6x_using_dsbt (obfd))
- {
- unsigned i;
-
- for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
- if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
- {
- Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
-
- for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
- if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
- {
- memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
-
- /* Rewrite the phdrs, since we're only called after they
- were first written. */
- if (bfd_seek (obfd,
- (bfd_signed_vma) get_elf_backend_data (obfd)
- ->s->sizeof_ehdr, SEEK_SET) != 0
- || get_elf_backend_data (obfd)->s
- ->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
- elf_elfheader (obfd)->e_phnum) != 0)
- return FALSE;
- break;
- }
-
- break;
- }
- }
-
- return TRUE;
-}
-
/* Add a new unwind edit to the list described by HEAD, TAIL. If TINDEX is zero,
adds the edit to the start of the list. (The list must be built in order of
ascending TINDEX: the function's callers are primarily responsible for
@@ -4484,12 +4372,12 @@ elf32_tic6x_set_osabi (bfd *abfd, struct
#define ELF_MAXPAGESIZE 0x1000
#define bfd_elf32_bfd_reloc_type_lookup elf32_tic6x_reloc_type_lookup
#define bfd_elf32_bfd_reloc_name_lookup elf32_tic6x_reloc_name_lookup
-#define bfd_elf32_bfd_copy_private_bfd_data elf32_tic6x_copy_private_data
#define bfd_elf32_bfd_merge_private_bfd_data elf32_tic6x_merge_private_bfd_data
#define bfd_elf32_mkobject elf32_tic6x_mkobject
#define bfd_elf32_bfd_link_hash_table_create elf32_tic6x_link_hash_table_create
#define bfd_elf32_bfd_link_hash_table_free elf32_tic6x_link_hash_table_free
#define bfd_elf32_new_section_hook elf32_tic6x_new_section_hook
+#define elf_backend_stack_align 8
#define elf_backend_can_gc_sections 1
#define elf_backend_default_use_rela_p 1
#define elf_backend_may_use_rel_p 1
@@ -4509,8 +4397,6 @@ elf32_tic6x_set_osabi (bfd *abfd, struct
#define elf_backend_fake_sections elf32_tic6x_fake_sections
#define elf_backend_gc_sweep_hook elf32_tic6x_gc_sweep_hook
#define elf_backend_gc_mark_extra_sections elf32_tic6x_gc_mark_extra_sections
-#define elf_backend_modify_program_headers \
- elf32_tic6x_modify_program_headers
#define elf_backend_create_dynamic_sections \
elf32_tic6x_create_dynamic_sections
#define elf_backend_adjust_dynamic_symbol \
Index: bfd/elflink.c
===================================================================
RCS file: /cvs/src/src/bfd/elflink.c,v
retrieving revision 1.454
diff -u -3 -p -r1.454 elflink.c
--- bfd/elflink.c 19 Sep 2012 00:53:28 -0000 1.454
+++ bfd/elflink.c 22 Oct 2012 11:52:10 -0000
@@ -5567,6 +5567,65 @@ _bfd_elf_size_group_sections (struct bfd
return TRUE;
}
+/* Set a default stack segment size. The value in INFO wins. If it
+ is unset, LEGACY_SYMBOL's value is used, and if that symbol is
+ undefined it is initialized. */
+
+bfd_boolean
+bfd_elf_stack_segment_size (bfd *output_bfd,
+ struct bfd_link_info *info,
+ const char *legacy_symbol,
+ bfd_vma default_size)
+{
+ struct elf_link_hash_entry *h = NULL;
+
+ /* Look for legacy symbol. */
+ if (legacy_symbol)
+ h = elf_link_hash_lookup (elf_hash_table (info), legacy_symbol,
+ FALSE, FALSE, FALSE);
+ if (h && (h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak)
+ && h->def_regular
+ && (h->type == STT_NOTYPE || h->type == STT_OBJECT))
+ {
+ /* The symbol has no type if specified on the command line. */
+ h->type = STT_OBJECT;
+ if (info->stacksize)
+ (*_bfd_error_handler) (_("%B: stack size specified and %s set"),
+ output_bfd, legacy_symbol);
+ else if (h->root.u.def.section != bfd_abs_section_ptr)
+ (*_bfd_error_handler) (_("%B: %s not absolute"),
+ output_bfd, legacy_symbol);
+ else
+ info->stacksize = h->root.u.def.value;
+ }
+
+ if (!info->stacksize)
+ /* If the user didn't set a size, or explicitly inhibit the
+ size, set it now. */
+ info->stacksize = default_size;
+
+ /* Provide the legacy symbol, if it is referenced. */
+ if (h && (h->root.type == bfd_link_hash_undefined
+ || h->root.type == bfd_link_hash_undefweak))
+ {
+ struct bfd_link_hash_entry *bh = NULL;
+
+ if (!(_bfd_generic_link_add_one_symbol
+ (info, output_bfd, legacy_symbol,
+ BSF_GLOBAL, bfd_abs_section_ptr,
+ info->stacksize >= 0 ? info->stacksize : 0,
+ NULL, FALSE, get_elf_backend_data (output_bfd)->collect, &bh)))
+ return FALSE;
+
+ h = (struct elf_link_hash_entry *) bh;
+ h->def_regular = 1;
+ h->type = STT_OBJECT;
+ }
+
+ return TRUE;
+}
+
/* Set up the sizes and contents of the ELF dynamic sections. This is
called by the ELF linker emulation before_allocation routine. We
must set the sizes of the sections before the linker sets the
@@ -5596,43 +5655,6 @@ bfd_elf_size_dynamic_sections (bfd *outp
return TRUE;
bed = get_elf_backend_data (output_bfd);
- if (info->execstack)
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
- else if (info->noexecstack)
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
- else
- {
- bfd *inputobj;
- asection *notesec = NULL;
- int exec = 0;
-
- for (inputobj = info->input_bfds;
- inputobj;
- inputobj = inputobj->link_next)
- {
- asection *s;
-
- if (inputobj->flags
- & (DYNAMIC | EXEC_P | BFD_PLUGIN | BFD_LINKER_CREATED))
- continue;
- s = bfd_get_section_by_name (inputobj, ".note.GNU-stack");
- if (s)
- {
- if (s->flags & SEC_CODE)
- exec = PF_X;
- notesec = s;
- }
- else if (bed->default_execstack)
- exec = PF_X;
- }
- if (notesec)
- {
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | exec;
- if (exec && info->relocatable
- && notesec->output_section != bfd_abs_section_ptr)
- notesec->output_section->flags |= SEC_CODE;
- }
- }
/* Any syms created from now on start with -1 in
got.refcount/offset and plt.refcount/offset. */
@@ -5651,6 +5673,63 @@ bfd_elf_size_dynamic_sections (bfd *outp
&& ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
return FALSE;
+ /* Determine any GNU_STACK segment requirements, after the backend
+ has had a chance to set a default segment size. */
+ {
+ bfd *inputobj;
+ int exec = 0;
+
+ /* Check for explicit exec stack setting. */
+ if (info->execstack
+ || (!info->noexecstack && info->stacksize > 0
+ && bed->default_execstack))
+ exec = PF_X;
+ else if (!info->noexecstack)
+ {
+ /* See if an input note section speficies exec stack. */
+ asection *notesec = NULL;
+
+ for (inputobj = info->input_bfds;
+ inputobj;
+ inputobj = inputobj->link_next)
+ {
+ asection *s;
+
+ if (inputobj->flags
+ & (DYNAMIC | EXEC_P | BFD_PLUGIN | BFD_LINKER_CREATED))
+ continue;
+ s = bfd_get_section_by_name (inputobj, ".note.GNU-stack");
+ if (s)
+ {
+ if (s->flags & SEC_CODE)
+ exec = PF_X;
+ notesec = s;
+ if (exec)
+ break;
+ }
+ else if (bed->default_execstack)
+ exec = PF_X;
+ }
+
+ if (notesec)
+ {
+ /* Propagate to output note section, if relocatable. */
+ if (exec && info->relocatable
+ && notesec->output_section != bfd_abs_section_ptr)
+ notesec->output_section->flags |= SEC_CODE;
+ }
+ else
+ /* If there was no input note section, then ignore the
+ default execstack setting. */
+ exec = 0;
+ }
+
+ /* If the stack size is non-zero, or it's executable, we want a
+ stack segment. */
+ if (exec || info->stacksize > 0)
+ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | exec;
+ }
+
dynobj = elf_hash_table (info)->dynobj;
if (dynobj != NULL && elf_hash_table (info)->dynamic_sections_created)
Index: bfd/elfxx-target.h
===================================================================
RCS file: /cvs/src/src/bfd/elfxx-target.h,v
retrieving revision 1.129
diff -u -3 -p -r1.129 elfxx-target.h
--- bfd/elfxx-target.h 23 Jan 2012 06:16:37 -0000 1.129
+++ bfd/elfxx-target.h 22 Oct 2012 11:52:10 -0000
@@ -109,6 +109,9 @@
#ifndef elf_backend_default_execstack
#define elf_backend_default_execstack 1
#endif
+#ifndef elf_backend_stack_align
+#define elf_backend_stack_align 16
+#endif
#define bfd_elfNN_bfd_debug_info_start bfd_void
#define bfd_elfNN_bfd_debug_info_end bfd_void
@@ -770,6 +773,7 @@ static struct elf_backend_data elfNN_bed
elf_backend_obj_attrs_order,
elf_backend_obj_attrs_handle_unknown,
elf_backend_static_tls_alignment,
+ elf_backend_stack_align,
elf_backend_collect,
elf_backend_type_change_ok,
elf_backend_may_use_rel_p,
Index: include/bfdlink.h
===================================================================
RCS file: /cvs/src/src/include/bfdlink.h,v
retrieving revision 1.95
diff -u -3 -p -r1.95 bfdlink.h
--- include/bfdlink.h 9 Apr 2012 16:27:18 -0000 1.95
+++ include/bfdlink.h 22 Oct 2012 11:52:14 -0000
@@ -416,6 +416,10 @@ struct bfd_link_info
/* Separator between archive and filename in linker script filespecs. */
char path_separator;
+ /* Default stack size. Zero means default (often zero itself), -1
+ means explicitly zero-sized. */
+ bfd_signed_vma stacksize;
+
/* Function callbacks. */
const struct bfd_link_callbacks *callbacks;
Index: ld/ld.texinfo
===================================================================
RCS file: /cvs/src/src/ld/ld.texinfo,v
retrieving revision 1.285
diff -u -3 -p -r1.285 ld.texinfo
--- ld/ld.texinfo 16 Sep 2012 22:21:00 -0000 1.285
+++ ld/ld.texinfo 22 Oct 2012 11:52:17 -0000
@@ -1093,6 +1093,11 @@ Set the emulation maximum page size to @
@item common-page-size=@var{value}
Set the emulation common page size to @var{value}.
+@item stack-size=@var{value}
+Specify a stack size for in an ELF @code{PT_GNU_STACK} segment.
+Specifying zero will override any default non-zero sized
+@code{PT_GNU_STACK} segment creation.
+
@end table
Other keywords are ignored for Solaris compatibility.
Index: ld/emultempl/elf32.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/elf32.em,v
retrieving revision 1.229
diff -u -3 -p -r1.229 elf32.em
--- ld/emultempl/elf32.em 13 Jul 2012 13:20:27 -0000 1.229
+++ ld/emultempl/elf32.em 22 Oct 2012 11:52:18 -0000
@@ -2276,6 +2276,17 @@ fragment <<EOF
einfo (_("%P%F: invalid common page size \`%s'\n"),
optarg + 17);
}
+ else if (CONST_STRNEQ (optarg, "stack-size="))
+ {
+ char *end;
+ link_info.stacksize = strtoul (optarg + 11, &end, 0);
+ if (*end || link_info.stacksize < 0)
+ einfo (_("%P%F: invalid stack size \`%s'\n"), optarg + 11);
+ if (!link_info.stacksize)
+ /* Use -1 for explicit no-stack, because zero means
+ 'default'. */
+ link_info.stacksize = -1;
+ }
else if (strcmp (optarg, "execstack") == 0)
{
link_info.execstack = TRUE;
Index: ld/testsuite/ld-elf/binutils.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/binutils.exp,v
retrieving revision 1.20
diff -u -3 -p -r1.20 binutils.exp
--- ld/testsuite/ld-elf/binutils.exp 13 Aug 2012 14:52:52 -0000 1.20
+++ ld/testsuite/ld-elf/binutils.exp 22 Oct 2012 11:52:19 -0000
@@ -60,7 +60,7 @@ proc binutils_test { prog_name ld_option
return
}
- if { ![ld_simple_link $ld tmpdir/$test "$ld_options tmpdir/$test.o"] } {
+ if { ![ld_simple_link $ld tmpdir/$test "$ld_options -z stack-size=0 tmpdir/$test.o"] } {
if { [string match "*not supported*" $link_output]
|| [string match "*unrecognized option*" $link_output]
|| [string match "*-z relro ignored*" $link_output] } {
Index: ld/testsuite/ld-elf/elf.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/elf.exp,v
retrieving revision 1.38
diff -u -3 -p -r1.38 elf.exp
--- ld/testsuite/ld-elf/elf.exp 31 Aug 2012 02:52:14 -0000 1.38
+++ ld/testsuite/ld-elf/elf.exp 22 Oct 2012 11:52:19 -0000
@@ -126,6 +126,15 @@ if { [check_gc_sections_available] && ![
}
}
+if { [istarget *-*-*linux*] } {
+ run_ld_link_tests {
+ {"stack exec" "-z execstack" "" {stack.s}
+ {{readelf {-Wl} stack-exec.rd}} "stack-exec.exe"}
+ {"stack size" "-z stack-size=0x123400" "" {stack.s}
+ {{readelf {-Wl} stack-size.rd}} "stack-size.exe"}
+ }
+}
+
set LDFLAGS $old_ldflags
# The following tests require running the executable generated by ld.
Index: ld/testsuite/ld-elf/orphan-region.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/orphan-region.d,v
retrieving revision 1.5
diff -u -3 -p -r1.5 orphan-region.d
--- ld/testsuite/ld-elf/orphan-region.d 11 Oct 2010 09:12:25 -0000 1.5
+++ ld/testsuite/ld-elf/orphan-region.d 22 Oct 2012 11:52:19 -0000
@@ -1,11 +1,11 @@
#source: orphan-region.s
-#ld: -T orphan-region.ld -N
+#ld: -T orphan-region.ld -N -z stack-size=0 -z noexecstack
#readelf: -S -l --wide
#xfail: arc-*-* d30v-*-* dlx-*-* fr30-*-* frv-*-elf i860-*-* i960-*-*
#xfail: iq*-*-* mn10200-*-* moxie-*-* msp*-*-* mt-*-* or32-*-* pj*-*-*
-#xfail: spu-*-* hppa*64*-*-* frv-*-*
+#xfail: spu-*-* hppa*64*-*-*
# if not using elf32.em, you don't get fancy orphan handling
-# spu twiddles LOAD range, hppa64 adds PHDR, frv-linux adds GNU_STACK
+# spu twiddles LOAD range, hppa64 adds PHDR
#...
\[[ 0-9]+\] \.text[ \t]+PROGBITS[ \t]+0*40000000[ \t]+.*
Index: ld/testsuite/ld-elf/stack-exec.rd
===================================================================
RCS file: ld/testsuite/ld-elf/stack-exec.rd
diff -N ld/testsuite/ld-elf/stack-exec.rd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/stack-exec.rd 22 Oct 2012 11:52:19 -0000
@@ -0,0 +1,3 @@
+#...
+ GNU_STACK 0x0+00000 0x0+000000 0x0+000000 0x0+000 0x.+0000 RWE 0x[0-9a-f]+
+#pass
Index: ld/testsuite/ld-elf/stack-size.rd
===================================================================
RCS file: ld/testsuite/ld-elf/stack-size.rd
diff -N ld/testsuite/ld-elf/stack-size.rd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/stack-size.rd 22 Oct 2012 11:52:19 -0000
@@ -0,0 +1,3 @@
+#...
+ GNU_STACK 0x0+00000 0x0+000000 0x0+000000 0x0+000 0x123400 RW. 0x[0-9a-f]+
+#pass
Index: ld/testsuite/ld-elf/stack.s
===================================================================
RCS file: ld/testsuite/ld-elf/stack.s
diff -N ld/testsuite/ld-elf/stack.s
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-elf/stack.s 22 Oct 2012 11:52:19 -0000
@@ -0,0 +1,10 @@
+ .text
+ .globl start
+ .globl _start
+start:
+_start:
+ nop
+ nop
+ nop
+ nop
+
Index: ld/testsuite/ld-scripts/empty-aligned.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-scripts/empty-aligned.d,v
retrieving revision 1.6
diff -u -3 -p -r1.6 empty-aligned.d
--- ld/testsuite/ld-scripts/empty-aligned.d 9 Sep 2009 12:13:42 -0000 1.6
+++ ld/testsuite/ld-scripts/empty-aligned.d 22 Oct 2012 11:52:20 -0000
@@ -1,5 +1,5 @@
#source: empty-aligned.s
-#ld: -T empty-aligned.t
+#ld: -T empty-aligned.t -z stack-size=0 -z noexecstack
#readelf: -l --wide
#xfail: "hppa64-*-*"
#notarget: frv-*-*linux*
Index: ld/testsuite/ld-sh/fdpic-stack-set.d
===================================================================
RCS file: ld/testsuite/ld-sh/fdpic-stack-set.d
diff -N ld/testsuite/ld-sh/fdpic-stack-set.d
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ld/testsuite/ld-sh/fdpic-stack-set.d 22 Oct 2012 11:52:20 -0000
@@ -0,0 +1,19 @@
+#source: fdpic-stack.s
+#as: --isa=sh2a -big --fdpic
+#ld: -EB -mshelf_fd -z stack-size=0x40000
+#readelf: -l
+#target: sh*-*-uclinux*
+
+Elf file type is EXEC \(Executable file\)
+Entry point 0x400074
+There are 2 program headers, starting at offset 52
+
+Program Headers:
+[ \t]+Type[ \t]+Offset[ \t]+VirtAddr[ \t]+PhysAddr[ \t]+FileSiz MemSiz[ \t]+Flg Align
+[ \t]+LOAD[ \t]+0x000000 0x00400000 0x00400000 0x00076 0x00076 R E 0x10000
+[ \t]+GNU_STACK[ \t]+0x000000 0x00000000 0x00000000 0x00000 0x40000 RWE 0x8
+
+ Section to Segment mapping:
+[ \t]+Segment Sections\.\.\.
+[ \t]+00[ \t]+\.text
+[ \t]+01[ \t]+
Index: ld/testsuite/ld-tic6x/shlib-1.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-1.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-1.rd
--- ld/testsuite/ld-tic6x/shlib-1.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-1.rd 22 Oct 2012 11:52:20 -0000
@@ -117,7 +117,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
.* 10000100 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 1000012c 4 OBJECT GLOBAL DEFAULT 11 g2
.* 10000088 52 FUNC GLOBAL DEFAULT 9 sub0
Index: ld/testsuite/ld-tic6x/shlib-1b.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-1b.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-1b.rd
--- ld/testsuite/ld-tic6x/shlib-1b.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-1b.rd 22 Oct 2012 11:52:20 -0000
@@ -117,7 +117,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
.* 10000100 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 1000012c 4 OBJECT GLOBAL DEFAULT 11 g2
.* 10000088 52 FUNC GLOBAL DEFAULT 9 sub0
Index: ld/testsuite/ld-tic6x/shlib-1r.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-1r.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-1r.rd
--- ld/testsuite/ld-tic6x/shlib-1r.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-1r.rd 22 Oct 2012 11:52:21 -0000
@@ -117,7 +117,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
.* 10000100 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 1000012c 4 OBJECT GLOBAL DEFAULT 11 g2
.* 10000088 52 FUNC GLOBAL DEFAULT 9 sub0
Index: ld/testsuite/ld-tic6x/shlib-1rb.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-1rb.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-1rb.rd
--- ld/testsuite/ld-tic6x/shlib-1rb.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-1rb.rd 22 Oct 2012 11:52:21 -0000
@@ -117,7 +117,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
.* 10000100 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 1000012c 4 OBJECT GLOBAL DEFAULT 11 g2
.* 10000088 52 FUNC GLOBAL DEFAULT 9 sub0
Index: ld/testsuite/ld-tic6x/shlib-app-1.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-app-1.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-app-1.rd
--- ld/testsuite/ld-tic6x/shlib-app-1.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-app-1.rd 22 Oct 2012 11:52:21 -0000
@@ -122,7 +122,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 100000ac 0 OBJECT LOCAL DEFAULT 11 _GLOBAL_OFFSET_TABLE_
.* 100000a0 0 NOTYPE LOCAL DEFAULT 11 __c6xabi_DSBT_BASE
.* 100000c0 4 OBJECT GLOBAL DEFAULT 12 b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 00000000 0 OBJECT WEAK DEFAULT UND g2
.* 00000000 0 FUNC GLOBAL DEFAULT UND sub0
Index: ld/testsuite/ld-tic6x/shlib-app-1b.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-app-1b.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-app-1b.rd
--- ld/testsuite/ld-tic6x/shlib-app-1b.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-app-1b.rd 22 Oct 2012 11:52:21 -0000
@@ -122,7 +122,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 100000ac 0 OBJECT LOCAL DEFAULT 11 _GLOBAL_OFFSET_TABLE_
.* 100000a0 0 NOTYPE LOCAL DEFAULT 11 __c6xabi_DSBT_BASE
.* 100000c0 4 OBJECT GLOBAL DEFAULT 12 b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 00000000 0 OBJECT WEAK DEFAULT UND g2
.* 00000000 0 FUNC GLOBAL DEFAULT UND sub0
Index: ld/testsuite/ld-tic6x/shlib-app-1r.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-app-1r.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-app-1r.rd
--- ld/testsuite/ld-tic6x/shlib-app-1r.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-app-1r.rd 22 Oct 2012 11:52:21 -0000
@@ -112,6 +112,5 @@ Symbol table '\.symtab' contains [0-9]+
.* 100000ac 0 OBJECT LOCAL DEFAULT 10 _GLOBAL_OFFSET_TABLE_
.* 100000a0 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 100000c0 4 OBJECT GLOBAL DEFAULT 11 b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 FUNC GLOBAL DEFAULT UND sub0
.* 100000c4 4 OBJECT GLOBAL DEFAULT 12 a
Index: ld/testsuite/ld-tic6x/shlib-app-1rb.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-app-1rb.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-app-1rb.rd
--- ld/testsuite/ld-tic6x/shlib-app-1rb.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-app-1rb.rd 22 Oct 2012 11:52:21 -0000
@@ -112,6 +112,5 @@ Symbol table '\.symtab' contains [0-9]+
.* 100000ac 0 OBJECT LOCAL DEFAULT 10 _GLOBAL_OFFSET_TABLE_
.* 100000a0 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 100000c0 4 OBJECT GLOBAL DEFAULT 11 b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 FUNC GLOBAL DEFAULT UND sub0
.* 100000c4 4 OBJECT GLOBAL DEFAULT 12 a
Index: ld/testsuite/ld-tic6x/shlib-noindex.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/shlib-noindex.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 shlib-noindex.rd
--- ld/testsuite/ld-tic6x/shlib-noindex.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/shlib-noindex.rd 22 Oct 2012 11:52:21 -0000
@@ -124,7 +124,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
.* 10000100 0 NOTYPE LOCAL DEFAULT 11 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 1000012c 4 OBJECT GLOBAL DEFAULT 12 g2
.* 10000088 52 FUNC GLOBAL DEFAULT 10 sub0
Index: ld/testsuite/ld-tic6x/static-app-1.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/static-app-1.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 static-app-1.rd
--- ld/testsuite/ld-tic6x/static-app-1.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/static-app-1.rd 22 Oct 2012 11:52:21 -0000
@@ -107,7 +107,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 100000cc 0 OBJECT LOCAL DEFAULT 8 _GLOBAL_OFFSET_TABLE_
.* 100000c0 0 NOTYPE LOCAL DEFAULT 8 __c6xabi_DSBT_BASE
.* 100000e8 4 OBJECT GLOBAL DEFAULT 9 b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 100000e4 4 OBJECT GLOBAL DEFAULT 9 g2
.* 10000008 52 FUNC GLOBAL DEFAULT 7 sub0
Index: ld/testsuite/ld-tic6x/static-app-1b.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/static-app-1b.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 static-app-1b.rd
--- ld/testsuite/ld-tic6x/static-app-1b.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/static-app-1b.rd 22 Oct 2012 11:52:21 -0000
@@ -107,7 +107,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 100000cc 0 OBJECT LOCAL DEFAULT 8 _GLOBAL_OFFSET_TABLE_
.* 100000c0 0 NOTYPE LOCAL DEFAULT 8 __c6xabi_DSBT_BASE
.* 100000e8 4 OBJECT GLOBAL DEFAULT 9 b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 100000e4 4 OBJECT GLOBAL DEFAULT 9 g2
.* 10000008 52 FUNC GLOBAL DEFAULT 7 sub0
Index: ld/testsuite/ld-tic6x/static-app-1r.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/static-app-1r.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 static-app-1r.rd
--- ld/testsuite/ld-tic6x/static-app-1r.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/static-app-1r.rd 22 Oct 2012 11:52:21 -0000
@@ -104,7 +104,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 100000cc 0 OBJECT LOCAL DEFAULT 8 _GLOBAL_OFFSET_TABLE_
.* 100000c0 0 NOTYPE LOCAL DEFAULT 8 __c6xabi_DSBT_BASE
.* 100000e8 4 OBJECT GLOBAL DEFAULT 9 b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 100000e4 4 OBJECT GLOBAL DEFAULT 9 g2
.* 10000008 52 FUNC GLOBAL DEFAULT 7 sub0
Index: ld/testsuite/ld-tic6x/static-app-1rb.rd
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-tic6x/static-app-1rb.rd,v
retrieving revision 1.5
diff -u -3 -p -r1.5 static-app-1rb.rd
--- ld/testsuite/ld-tic6x/static-app-1rb.rd 15 Jun 2012 15:13:41 -0000 1.5
+++ ld/testsuite/ld-tic6x/static-app-1rb.rd 22 Oct 2012 11:52:21 -0000
@@ -104,7 +104,6 @@ Symbol table '\.symtab' contains [0-9]+
.* 100000cc 0 OBJECT LOCAL DEFAULT 8 _GLOBAL_OFFSET_TABLE_
.* 100000c0 0 NOTYPE LOCAL DEFAULT 8 __c6xabi_DSBT_BASE
.* 100000e8 4 OBJECT GLOBAL DEFAULT 9 b
-.* 00020000 0 OBJECT GLOBAL DEFAULT ABS __stacksize
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
.* 100000e4 4 OBJECT GLOBAL DEFAULT 9 g2
.* 10000008 52 FUNC GLOBAL DEFAULT 7 sub0
More information about the Binutils
mailing list