From 7a2b07ff7e6a3f34e8022a1a72c8a8e812c1da7b Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 8 Nov 2007 13:51:07 +0000 Subject: [PATCH] include/elf/ * vxworks.h: New. bfd/ * elf-vxworks.h (elf_vxworks_add_dynamic_entries): Declare. (elf_vxworks_finish_dynamic_entry): Declare. * elf-vxworks.c: Include elf/vxworks.h. (elf_vxworks_add_dynamic_entries): New. (elf_vxworks_finish_dynamic_entry): New. * Makefile.am (elf-vxworks.lo): Add dependency. * Makefile.in (elf-vxworks.lo): Add dependency. * elf32-i386.c (elf_i386_size_dynamic_sections, elf_i386_finish_dynamic_sections): Call elf_vxworks_add_dynamic_entries and elf_vxworks_finish_dynamic_entry. * elf32-ppc.c (ppc_elf_size_dynamic_sections, ppc_elf_finish_dynamic_sections): Likewise. * elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections, sparc_finish_dyn): Likewise. * elf32-sh.c (sh_elf_size_dynamic_sections, sh_elf_finish_dynamic_sections): Likewise. * elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections, _bfd_mips_elf_finish_dynamic_sections): Likewise. * elf32-arm.c (elf32_arm_size_dynamic_sections, elf32_arm_finish_dynamic_sections): Likewise. ld/ * ld-vxworks/tls-2.d: New. * ld-vxworks/tls-2.s: New. --- bfd/ChangeLog | 24 ++++++++++++++++++++++++ bfd/Makefile.am | 2 +- bfd/Makefile.in | 2 +- bfd/elf32-arm.c | 6 ++++++ bfd/elf32-i386.c | 6 ++++++ bfd/elf32-ppc.c | 8 +++++++- bfd/elf32-sh.c | 6 ++++++ bfd/elfxx-mips.c | 6 ++++++ bfd/elfxx-sparc.c | 6 ++++++ include/elf/ChangeLog | 4 ++++ include/elf/vxworks.h | 33 +++++++++++++++++++++++++++++++++ ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-vxworks/tls-2.d | 11 +++++++++++ ld/testsuite/ld-vxworks/tls-2.s | 19 +++++++++++++++++++ 14 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 include/elf/vxworks.h create mode 100644 ld/testsuite/ld-vxworks/tls-2.d create mode 100644 ld/testsuite/ld-vxworks/tls-2.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b05c8eefe6a..5b37351eccb 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,27 @@ +2007-11-08 Nathan Sidwell + + * elf-vxworks.h (elf_vxworks_add_dynamic_entries): Declare. + (elf_vxworks_finish_dynamic_entry): Declare. + * elf-vxworks.c: Include elf/vxworks.h. + (elf_vxworks_add_dynamic_entries): New. + (elf_vxworks_finish_dynamic_entry): New. + * Makefile.am (elf-vxworks.lo): Add dependency. + * Makefile.in (elf-vxworks.lo): Add dependency. + * elf32-i386.c (elf_i386_size_dynamic_sections, + elf_i386_finish_dynamic_sections): Call + elf_vxworks_add_dynamic_entries and + elf_vxworks_finish_dynamic_entry. + * elf32-ppc.c (ppc_elf_size_dynamic_sections, + ppc_elf_finish_dynamic_sections): Likewise. + * elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections, + sparc_finish_dyn): Likewise. + * elf32-sh.c (sh_elf_size_dynamic_sections, + sh_elf_finish_dynamic_sections): Likewise. + * elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections, + _bfd_mips_elf_finish_dynamic_sections): Likewise. + * elf32-arm.c (elf32_arm_size_dynamic_sections, + elf32_arm_finish_dynamic_sections): Likewise. + 2007-11-07 Olivier Hainque * bfd/elfxx-mips.c (_bfd_mips_elf_fake_sections): Force diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 3d92daee53b..0ee4e3ea79f 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -1580,7 +1580,7 @@ elf-eh-frame.lo: elf-eh-frame.c $(INCDIR)/filenames.h \ elf-vxworks.lo: elf-vxworks.c $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - elf-vxworks.h + $(INCDIR)/elf/vxworks.h elf-vxworks.h epoc-pe-arm.lo: epoc-pe-arm.c pe-arm.c $(INCDIR)/filenames.h \ coff-arm.c $(INCDIR)/hashtab.h $(INCDIR)/coff/arm.h \ $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 3e5ee0a8ac4..df0e45ae647 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -2160,7 +2160,7 @@ elf-eh-frame.lo: elf-eh-frame.c $(INCDIR)/filenames.h \ elf-vxworks.lo: elf-vxworks.c $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - elf-vxworks.h + $(INCDIR)/elf/vxworks.h elf-vxworks.h epoc-pe-arm.lo: epoc-pe-arm.c pe-arm.c $(INCDIR)/filenames.h \ coff-arm.c $(INCDIR)/hashtab.h $(INCDIR)/coff/arm.h \ $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \ diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index cbde697360b..0e8e4239e7a 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -8723,6 +8723,9 @@ elf32_arm_size_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED, if (!add_dynamic_entry (DT_TEXTREL, 0)) return FALSE; } + if (htab->vxworks_p + && !elf_vxworks_add_dynamic_entries (output_bfd, info)) + return FALSE; } #undef add_dynamic_entry @@ -9065,6 +9068,9 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info unsigned int type; default: + if (htab->vxworks_p + && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn)) + bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); break; case DT_HASH: diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index e2396ce140d..802c2b14505 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2374,6 +2374,9 @@ elf_i386_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, return FALSE; } } + if (htab->is_vxworks + && !elf_vxworks_add_dynamic_entries (output_bfd, info)) + return FALSE; } #undef add_dynamic_entry @@ -3796,6 +3799,9 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd, switch (dyn.d_tag) { default: + if (htab->is_vxworks + && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn)) + break; continue; case DT_PLTGOT: diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 17978a0bef7..69cc740e817 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -5188,7 +5188,10 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, if (!add_dynamic_entry (DT_TEXTREL, 0)) return FALSE; } - } + if (htab->is_vxworks + && !elf_vxworks_add_dynamic_entries (output_bfd, info)) + return FALSE; + } #undef add_dynamic_entry return TRUE; @@ -7353,6 +7356,9 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd, continue; default: + if (htab->is_vxworks + && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn)) + break; continue; } diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 3d4a2ffd622..24ac5bbfdb4 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -3138,6 +3138,9 @@ sh_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, return FALSE; } } + if (htab->vxworks_p + && !elf_vxworks_add_dynamic_entries (output_bfd, info)) + return FALSE; } #undef add_dynamic_entry @@ -5763,6 +5766,9 @@ sh_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) switch (dyn.d_tag) { default: + if (htab->vxworks_p + && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn)) + bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); break; #ifdef INCLUDE_SHMEDIA diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index c571077fa63..217cd9207be 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -7674,6 +7674,9 @@ _bfd_mips_elf_size_dynamic_sections (bfd *output_bfd, && !MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_OPTIONS, 0)) return FALSE; } + if (htab->is_vxworks + && !elf_vxworks_add_dynamic_entries (output_bfd, info)) + return FALSE; } return TRUE; @@ -8901,6 +8904,9 @@ _bfd_mips_elf_finish_dynamic_sections (bfd *output_bfd, default: swap_out_p = FALSE; + if (htab->is_vxworks + && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn)) + swap_out_p = TRUE; break; } diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 736f044ab7d..79f8f86d0d3 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -2396,6 +2396,9 @@ _bfd_sparc_elf_size_dynamic_sections (bfd *output_bfd, eht->dynsymcount++; } } + if (htab->is_vxworks + && !elf_vxworks_add_dynamic_entries (output_bfd, info)) + return FALSE; } #undef add_dynamic_entry @@ -3846,6 +3849,9 @@ sparc_finish_dyn (bfd *output_bfd, struct bfd_link_info *info, bed->s->swap_dyn_out (output_bfd, &dyn, dyncon); } } + else if (htab->is_vxworks + && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn)) + bed->s->swap_dyn_out (output_bfd, &dyn, dyncon); else if (abi_64_p && dyn.d_tag == DT_SPARC_REGISTER) { if (stt_regidx == -1) diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 57bcd3b63d8..fdce868c1b7 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,7 @@ +2007-11-08 Nathan Sidwell + + * vxworks.h: New. + 2007-10-30 Nick Clifton * mn10300.h (R_MN10300_ALIGN): Define. diff --git a/include/elf/vxworks.h b/include/elf/vxworks.h new file mode 100644 index 00000000000..394de30dd45 --- /dev/null +++ b/include/elf/vxworks.h @@ -0,0 +1,33 @@ +/* VxWorks ELF support for BFD. + Copyright 2007 + Free Software Foundation, Inc. + + Contributed by Nathan Sidwell + +This file is part of BFD, the Binary File Descriptor library. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +MA 02110-1301, USA. */ + +#ifndef _ELF_VXWORKS_H +#define _ELF_VXWORKS_H + +#define DT_VX_WRS_TLS_DATA_START 0x60000010 +#define DT_VX_WRS_TLS_DATA_SIZE 0x60000011 +#define DT_VX_WRS_TLS_DATA_ALIGN 0x60000015 +#define DT_VX_WRS_TLS_VARS_START 0x60000012 +#define DT_VX_WRS_TLS_VARS_SIZE 0x60000013 + +#endif /* _ELF_VXWORKS_H */ diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 4da2964ef46..08052995ef5 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-11-08 Nathan Sidwell + + * ld-vxworks/tls-2.d: New. + * ld-vxworks/tls-2.s: New. + 2007-11-07 Nathan Sidwell * ld-vxworks/tls-1.d: New. diff --git a/ld/testsuite/ld-vxworks/tls-2.d b/ld/testsuite/ld-vxworks/tls-2.d new file mode 100644 index 00000000000..4278355ea39 --- /dev/null +++ b/ld/testsuite/ld-vxworks/tls-2.d @@ -0,0 +1,11 @@ +# source: tls-2.s +# ld: --entry foo -q --force-dynamic +# readelf: -d + +#... + 0x60000010 \(Operating System specific: 60000010\) 0x[0-9a-f]+ + 0x60000011 \(Operating System specific: 60000011\) 0x4 + 0x60000015 \(Operating System specific: 60000015\) 0x4 + 0x60000012 \(Operating System specific: 60000012\) 0x[0-9a-f]+ + 0x60000013 \(Operating System specific: 60000013\) 0xc +#... diff --git a/ld/testsuite/ld-vxworks/tls-2.s b/ld/testsuite/ld-vxworks/tls-2.s new file mode 100644 index 00000000000..8fa97ab528c --- /dev/null +++ b/ld/testsuite/ld-vxworks/tls-2.s @@ -0,0 +1,19 @@ + .globl foo +foo: + + .section .tls_data + .p2align 2 + .type i,%object + .size i,4 +i: + .space 4 + .globl __tls__i + .section .tls_vars + .p2align 2 + .type __tls__i,%object + .size __tls__i,12 +__tls__i: + .4byte i + .4byte 0 + .4byte 4 + -- 2.30.2