From 522e02ab8a7484881ca8290c6cd245d33867d5d4 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 4 Sep 2015 19:44:27 +0000 Subject: Rename bits/linkmap.h to linkmap.h (bug 14912). It was noted in that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/linkmap.h to plain linkmap.h to follow that convention. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/linkmap.h: Move to ... * sysdeps/generic/linkmap.h: ...here. * sysdeps/aarch64/bits/linkmap.h: Move to ... * sysdeps/aarch64/linkmap.h: ...here. * sysdeps/arm/bits/linkmap.h: Move to ... * sysdeps/arm/linkmap.h: ...here. * sysdeps/hppa/bits/linkmap.h: Move to ... * sysdeps/hppa/linkmap.h: ...here. * sysdeps/ia64/bits/linkmap.h: Move to ... * sysdeps/ia64/linkmap.h: ...here. * sysdeps/mips/bits/linkmap.h: Move to ... * sysdeps/mips/linkmap.h: ...here. * sysdeps/s390/bits/linkmap.h: Move to ... * sysdeps/s390/linkmap.h: ...here. * sysdeps/sh/bits/linkmap.h: Move to ... * sysdeps/sh/linkmap.h: ...here. * sysdeps/x86/bits/linkmap.h: Move to ... * sysdeps/x86/linkmap.h: ...here. * include/link.h: Include instead of . --- ChangeLog | 23 +++++++++++++++++++++++ bits/linkmap.h | 4 ---- include/link.h | 2 +- sysdeps/aarch64/bits/linkmap.h | 23 ----------------------- sysdeps/aarch64/linkmap.h | 23 +++++++++++++++++++++++ sysdeps/arm/bits/linkmap.h | 5 ----- sysdeps/arm/linkmap.h | 5 +++++ sysdeps/generic/linkmap.h | 4 ++++ sysdeps/hppa/bits/linkmap.h | 6 ------ sysdeps/hppa/linkmap.h | 6 ++++++ sysdeps/ia64/bits/linkmap.h | 5 ----- sysdeps/ia64/linkmap.h | 5 +++++ sysdeps/mips/bits/linkmap.h | 6 ------ sysdeps/mips/linkmap.h | 6 ++++++ sysdeps/s390/bits/linkmap.h | 13 ------------- sysdeps/s390/linkmap.h | 13 +++++++++++++ sysdeps/sh/bits/linkmap.h | 5 ----- sysdeps/sh/linkmap.h | 5 +++++ sysdeps/x86/bits/linkmap.h | 16 ---------------- sysdeps/x86/linkmap.h | 16 ++++++++++++++++ 20 files changed, 107 insertions(+), 84 deletions(-) delete mode 100644 bits/linkmap.h delete mode 100644 sysdeps/aarch64/bits/linkmap.h create mode 100644 sysdeps/aarch64/linkmap.h delete mode 100644 sysdeps/arm/bits/linkmap.h create mode 100644 sysdeps/arm/linkmap.h create mode 100644 sysdeps/generic/linkmap.h delete mode 100644 sysdeps/hppa/bits/linkmap.h create mode 100644 sysdeps/hppa/linkmap.h delete mode 100644 sysdeps/ia64/bits/linkmap.h create mode 100644 sysdeps/ia64/linkmap.h delete mode 100644 sysdeps/mips/bits/linkmap.h create mode 100644 sysdeps/mips/linkmap.h delete mode 100644 sysdeps/s390/bits/linkmap.h create mode 100644 sysdeps/s390/linkmap.h delete mode 100644 sysdeps/sh/bits/linkmap.h create mode 100644 sysdeps/sh/linkmap.h delete mode 100644 sysdeps/x86/bits/linkmap.h create mode 100644 sysdeps/x86/linkmap.h diff --git a/ChangeLog b/ChangeLog index 76bbb73..1db8e31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2015-09-04 Joseph Myers + + [BZ #14912] + * bits/linkmap.h: Move to ... + * sysdeps/generic/linkmap.h: ...here. + * sysdeps/aarch64/bits/linkmap.h: Move to ... + * sysdeps/aarch64/linkmap.h: ...here. + * sysdeps/arm/bits/linkmap.h: Move to ... + * sysdeps/arm/linkmap.h: ...here. + * sysdeps/hppa/bits/linkmap.h: Move to ... + * sysdeps/hppa/linkmap.h: ...here. + * sysdeps/ia64/bits/linkmap.h: Move to ... + * sysdeps/ia64/linkmap.h: ...here. + * sysdeps/mips/bits/linkmap.h: Move to ... + * sysdeps/mips/linkmap.h: ...here. + * sysdeps/s390/bits/linkmap.h: Move to ... + * sysdeps/s390/linkmap.h: ...here. + * sysdeps/sh/bits/linkmap.h: Move to ... + * sysdeps/sh/linkmap.h: ...here. + * sysdeps/x86/bits/linkmap.h: Move to ... + * sysdeps/x86/linkmap.h: ...here. + * include/link.h: Include instead of . + 2015-09-04 Andreas Schwab [BZ #18635] diff --git a/bits/linkmap.h b/bits/linkmap.h deleted file mode 100644 index 470b4d3..0000000 --- a/bits/linkmap.h +++ /dev/null @@ -1,4 +0,0 @@ -struct link_map_machine - { - /* empty by default */ - }; diff --git a/include/link.h b/include/link.h index 7e7eb79..e44110c 100644 --- a/include/link.h +++ b/include/link.h @@ -39,7 +39,7 @@ extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid, #include #include -#include +#include #include #include #include diff --git a/sysdeps/aarch64/bits/linkmap.h b/sysdeps/aarch64/bits/linkmap.h deleted file mode 100644 index 9fed9b3..0000000 --- a/sysdeps/aarch64/bits/linkmap.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (C) 2009-2015 Free Software Foundation, Inc. - - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -struct link_map_machine -{ - ElfW(Addr) plt; /* Address of .plt */ - void *tlsdesc_table; /* Address of TLS descriptor hash table. */ -}; diff --git a/sysdeps/aarch64/linkmap.h b/sysdeps/aarch64/linkmap.h new file mode 100644 index 0000000..9fed9b3 --- /dev/null +++ b/sysdeps/aarch64/linkmap.h @@ -0,0 +1,23 @@ +/* Copyright (C) 2009-2015 Free Software Foundation, Inc. + + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +struct link_map_machine +{ + ElfW(Addr) plt; /* Address of .plt */ + void *tlsdesc_table; /* Address of TLS descriptor hash table. */ +}; diff --git a/sysdeps/arm/bits/linkmap.h b/sysdeps/arm/bits/linkmap.h deleted file mode 100644 index 7c2b4a6..0000000 --- a/sysdeps/arm/bits/linkmap.h +++ /dev/null @@ -1,5 +0,0 @@ -struct link_map_machine - { - Elf32_Addr plt; /* Address of .plt */ - void *tlsdesc_table; /* Address of TLS descriptor hash table. */ - }; diff --git a/sysdeps/arm/linkmap.h b/sysdeps/arm/linkmap.h new file mode 100644 index 0000000..7c2b4a6 --- /dev/null +++ b/sysdeps/arm/linkmap.h @@ -0,0 +1,5 @@ +struct link_map_machine + { + Elf32_Addr plt; /* Address of .plt */ + void *tlsdesc_table; /* Address of TLS descriptor hash table. */ + }; diff --git a/sysdeps/generic/linkmap.h b/sysdeps/generic/linkmap.h new file mode 100644 index 0000000..470b4d3 --- /dev/null +++ b/sysdeps/generic/linkmap.h @@ -0,0 +1,4 @@ +struct link_map_machine + { + /* empty by default */ + }; diff --git a/sysdeps/hppa/bits/linkmap.h b/sysdeps/hppa/bits/linkmap.h deleted file mode 100644 index 54842b2..0000000 --- a/sysdeps/hppa/bits/linkmap.h +++ /dev/null @@ -1,6 +0,0 @@ -/* Used to store the function descriptor table */ -struct link_map_machine - { - size_t fptr_table_len; - ElfW(Addr) *fptr_table; - }; diff --git a/sysdeps/hppa/linkmap.h b/sysdeps/hppa/linkmap.h new file mode 100644 index 0000000..54842b2 --- /dev/null +++ b/sysdeps/hppa/linkmap.h @@ -0,0 +1,6 @@ +/* Used to store the function descriptor table */ +struct link_map_machine + { + size_t fptr_table_len; + ElfW(Addr) *fptr_table; + }; diff --git a/sysdeps/ia64/bits/linkmap.h b/sysdeps/ia64/bits/linkmap.h deleted file mode 100644 index 7f8b055..0000000 --- a/sysdeps/ia64/bits/linkmap.h +++ /dev/null @@ -1,5 +0,0 @@ -struct link_map_machine - { - size_t fptr_table_len; - Elf64_Addr *fptr_table; - }; diff --git a/sysdeps/ia64/linkmap.h b/sysdeps/ia64/linkmap.h new file mode 100644 index 0000000..7f8b055 --- /dev/null +++ b/sysdeps/ia64/linkmap.h @@ -0,0 +1,5 @@ +struct link_map_machine + { + size_t fptr_table_len; + Elf64_Addr *fptr_table; + }; diff --git a/sysdeps/mips/bits/linkmap.h b/sysdeps/mips/bits/linkmap.h deleted file mode 100644 index 1fb9678..0000000 --- a/sysdeps/mips/bits/linkmap.h +++ /dev/null @@ -1,6 +0,0 @@ -struct link_map_machine - { - ElfW(Addr) plt; /* Address of .plt */ - ElfW(Word) fpabi; /* FP ABI of the object */ - unsigned int odd_spreg; /* Does the object require odd_spreg support? */ - }; diff --git a/sysdeps/mips/linkmap.h b/sysdeps/mips/linkmap.h new file mode 100644 index 0000000..1fb9678 --- /dev/null +++ b/sysdeps/mips/linkmap.h @@ -0,0 +1,6 @@ +struct link_map_machine + { + ElfW(Addr) plt; /* Address of .plt */ + ElfW(Word) fpabi; /* FP ABI of the object */ + unsigned int odd_spreg; /* Does the object require odd_spreg support? */ + }; diff --git a/sysdeps/s390/bits/linkmap.h b/sysdeps/s390/bits/linkmap.h deleted file mode 100644 index fc1fba3..0000000 --- a/sysdeps/s390/bits/linkmap.h +++ /dev/null @@ -1,13 +0,0 @@ -#if __WORDSIZE == 64 -struct link_map_machine - { - Elf64_Addr plt; /* Address of .plt + 0x2e */ - Elf64_Addr gotplt; /* Address of .got + 0x18 */ - }; -#else -struct link_map_machine - { - Elf32_Addr plt; /* Address of .plt + 0x2c */ - Elf32_Addr gotplt; /* Address of .got + 0x0c */ - }; -#endif diff --git a/sysdeps/s390/linkmap.h b/sysdeps/s390/linkmap.h new file mode 100644 index 0000000..fc1fba3 --- /dev/null +++ b/sysdeps/s390/linkmap.h @@ -0,0 +1,13 @@ +#if __WORDSIZE == 64 +struct link_map_machine + { + Elf64_Addr plt; /* Address of .plt + 0x2e */ + Elf64_Addr gotplt; /* Address of .got + 0x18 */ + }; +#else +struct link_map_machine + { + Elf32_Addr plt; /* Address of .plt + 0x2c */ + Elf32_Addr gotplt; /* Address of .got + 0x0c */ + }; +#endif diff --git a/sysdeps/sh/bits/linkmap.h b/sysdeps/sh/bits/linkmap.h deleted file mode 100644 index bb2fbb5..0000000 --- a/sysdeps/sh/bits/linkmap.h +++ /dev/null @@ -1,5 +0,0 @@ -struct link_map_machine - { - Elf32_Addr plt; /* Address of .plt + 36 */ - Elf32_Addr gotplt; /* Address of .got + 0x0c */ - }; diff --git a/sysdeps/sh/linkmap.h b/sysdeps/sh/linkmap.h new file mode 100644 index 0000000..bb2fbb5 --- /dev/null +++ b/sysdeps/sh/linkmap.h @@ -0,0 +1,5 @@ +struct link_map_machine + { + Elf32_Addr plt; /* Address of .plt + 36 */ + Elf32_Addr gotplt; /* Address of .got + 0x0c */ + }; diff --git a/sysdeps/x86/bits/linkmap.h b/sysdeps/x86/bits/linkmap.h deleted file mode 100644 index dd0d140..0000000 --- a/sysdeps/x86/bits/linkmap.h +++ /dev/null @@ -1,16 +0,0 @@ -#if __WORDSIZE == 64 -struct link_map_machine - { - Elf64_Addr plt; /* Address of .plt + 0x16 */ - Elf64_Addr gotplt; /* Address of .got + 0x18 */ - void *tlsdesc_table; /* Address of TLS descriptor hash table. */ - }; - -#else -struct link_map_machine - { - Elf32_Addr plt; /* Address of .plt + 0x16 */ - Elf32_Addr gotplt; /* Address of .got + 0x0c */ - void *tlsdesc_table; /* Address of TLS descriptor hash table. */ - }; -#endif diff --git a/sysdeps/x86/linkmap.h b/sysdeps/x86/linkmap.h new file mode 100644 index 0000000..dd0d140 --- /dev/null +++ b/sysdeps/x86/linkmap.h @@ -0,0 +1,16 @@ +#if __WORDSIZE == 64 +struct link_map_machine + { + Elf64_Addr plt; /* Address of .plt + 0x16 */ + Elf64_Addr gotplt; /* Address of .got + 0x18 */ + void *tlsdesc_table; /* Address of TLS descriptor hash table. */ + }; + +#else +struct link_map_machine + { + Elf32_Addr plt; /* Address of .plt + 0x16 */ + Elf32_Addr gotplt; /* Address of .got + 0x0c */ + void *tlsdesc_table; /* Address of TLS descriptor hash table. */ + }; +#endif -- cgit v1.1