From 522e02ab8a7484881ca8290c6cd245d33867d5d4 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 4 Sep 2015 19:44:27 +0000 Subject: [PATCH] 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 +++++++++++++++++++++++ include/link.h | 2 +- sysdeps/aarch64/{bits => }/linkmap.h | 0 sysdeps/arm/{bits => }/linkmap.h | 0 {bits => sysdeps/generic}/linkmap.h | 0 sysdeps/hppa/{bits => }/linkmap.h | 0 sysdeps/ia64/{bits => }/linkmap.h | 0 sysdeps/mips/{bits => }/linkmap.h | 0 sysdeps/s390/{bits => }/linkmap.h | 0 sysdeps/sh/{bits => }/linkmap.h | 0 sysdeps/x86/{bits => }/linkmap.h | 0 11 files changed, 24 insertions(+), 1 deletion(-) rename sysdeps/aarch64/{bits => }/linkmap.h (100%) rename sysdeps/arm/{bits => }/linkmap.h (100%) rename {bits => sysdeps/generic}/linkmap.h (100%) rename sysdeps/hppa/{bits => }/linkmap.h (100%) rename sysdeps/ia64/{bits => }/linkmap.h (100%) rename sysdeps/mips/{bits => }/linkmap.h (100%) rename sysdeps/s390/{bits => }/linkmap.h (100%) rename sysdeps/sh/{bits => }/linkmap.h (100%) rename sysdeps/x86/{bits => }/linkmap.h (100%) 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/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/linkmap.h similarity index 100% rename from sysdeps/aarch64/bits/linkmap.h rename to sysdeps/aarch64/linkmap.h diff --git a/sysdeps/arm/bits/linkmap.h b/sysdeps/arm/linkmap.h similarity index 100% rename from sysdeps/arm/bits/linkmap.h rename to sysdeps/arm/linkmap.h diff --git a/bits/linkmap.h b/sysdeps/generic/linkmap.h similarity index 100% rename from bits/linkmap.h rename to sysdeps/generic/linkmap.h diff --git a/sysdeps/hppa/bits/linkmap.h b/sysdeps/hppa/linkmap.h similarity index 100% rename from sysdeps/hppa/bits/linkmap.h rename to sysdeps/hppa/linkmap.h diff --git a/sysdeps/ia64/bits/linkmap.h b/sysdeps/ia64/linkmap.h similarity index 100% rename from sysdeps/ia64/bits/linkmap.h rename to sysdeps/ia64/linkmap.h diff --git a/sysdeps/mips/bits/linkmap.h b/sysdeps/mips/linkmap.h similarity index 100% rename from sysdeps/mips/bits/linkmap.h rename to sysdeps/mips/linkmap.h diff --git a/sysdeps/s390/bits/linkmap.h b/sysdeps/s390/linkmap.h similarity index 100% rename from sysdeps/s390/bits/linkmap.h rename to sysdeps/s390/linkmap.h diff --git a/sysdeps/sh/bits/linkmap.h b/sysdeps/sh/linkmap.h similarity index 100% rename from sysdeps/sh/bits/linkmap.h rename to sysdeps/sh/linkmap.h diff --git a/sysdeps/x86/bits/linkmap.h b/sysdeps/x86/linkmap.h similarity index 100% rename from sysdeps/x86/bits/linkmap.h rename to sysdeps/x86/linkmap.h -- 2.7.4