diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 7 | ||||
| -rw-r--r-- | gas/config/obj-elf.c | 12 | ||||
| -rw-r--r-- | gas/config/tc-ia64.c | 2 | ||||
| -rw-r--r-- | gas/doc/as.texinfo | 5 |
4 files changed, 17 insertions, 9 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 3b833c8..9e7e594 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2011-07-03 Samuel Thibault <samuel.thibault@gnu.org> + Thomas Schwinge <thomas@schwinge.name> + + * config/obj-elf.c (obj_elf_type): Use ELFOSABI_GNU name instead of + ELFOSABI_LINUX alias. + * config/tc-ia64.c: Likewise. + 2011-06-30 Paul Carroll <pcarroll@codesourcery.com> * config/tc-arm.c (do_t_add_sub): Only allow LSL shifts of less diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index 30eb816..820f1cf 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -1704,8 +1704,8 @@ obj_elf_type (int ignore ATTRIBUTE_UNUSED) const struct elf_backend_data *bed; bed = get_elf_backend_data (stdoutput); - if (!(bed->elf_osabi == ELFOSABI_LINUX - /* GNU/Linux is still using the default value 0. */ + if (!(bed->elf_osabi == ELFOSABI_GNU + /* GNU is still using the default value 0. */ || bed->elf_osabi == ELFOSABI_NONE)) as_bad (_("symbol type \"%s\" is supported only by GNU targets"), type_name); @@ -1716,14 +1716,14 @@ obj_elf_type (int ignore ATTRIBUTE_UNUSED) struct elf_backend_data *bed; bed = (struct elf_backend_data *) get_elf_backend_data (stdoutput); - if (!(bed->elf_osabi == ELFOSABI_LINUX - /* GNU/Linux is still using the default value 0. */ + if (!(bed->elf_osabi == ELFOSABI_GNU + /* GNU is still using the default value 0. */ || bed->elf_osabi == ELFOSABI_NONE)) as_bad (_("symbol type \"%s\" is supported only by GNU targets"), type_name); type = BSF_OBJECT | BSF_GNU_UNIQUE; - /* PR 10549: Always set OSABI field to LINUX for objects containing unique symbols. */ - bed->elf_osabi = ELFOSABI_LINUX; + /* PR 10549: Always set OSABI field to GNU for objects containing unique symbols. */ + bed->elf_osabi = ELFOSABI_GNU; } #ifdef md_elf_symbol_type else if ((type = md_elf_symbol_type (type_name, sym, elfsym)) != -1) diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c index 17ced7a..a5100c2 100644 --- a/gas/config/tc-ia64.c +++ b/gas/config/tc-ia64.c @@ -614,7 +614,7 @@ pseudo_func[] = { "svr4", PSEUDO_FUNC_CONST, { ELFOSABI_NONE } }, { "hpux", PSEUDO_FUNC_CONST, { ELFOSABI_HPUX } }, { "nt", PSEUDO_FUNC_CONST, { 2 } }, /* conflicts w/ELFOSABI_NETBSD */ - { "linux", PSEUDO_FUNC_CONST, { ELFOSABI_LINUX } }, + { "linux", PSEUDO_FUNC_CONST, { ELFOSABI_GNU } }, { "freebsd", PSEUDO_FUNC_CONST, { ELFOSABI_FREEBSD } }, { "openvms", PSEUDO_FUNC_CONST, { ELFOSABI_OPENVMS } }, { "nsk", PSEUDO_FUNC_CONST, { ELFOSABI_NSK } }, diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo index 7313b16..d4879b6 100644 --- a/gas/doc/as.texinfo +++ b/gas/doc/as.texinfo @@ -6438,7 +6438,7 @@ Mark the symbol as being a function name. @item STT_GNU_IFUNC @itemx gnu_indirect_function Mark the symbol as an indirect function when evaluated during reloc -processing. (This is only supported on Linux targeted assemblers). +processing. (This is only supported on assemblers targeting GNU systems). @item STT_OBJECT @itemx object @@ -6459,7 +6459,8 @@ Does not mark the symbol in any way. It is supported just for completeness. @item gnu_unique_object Marks the symbol as being a globally unique data object. The dynamic linker will make sure that in the entire process there is just one symbol with this -name and type in use. (This is only supported on Linux targeted assemblers). +name and type in use. (This is only supported on assemblers targeting GNU +systems). @end table |