This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Rename bits/linkmap.h to linkmap.h (bug 14912)
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Fri, 4 Sep 2015 14:05:26 +0000
- Subject: Rename bits/linkmap.h to linkmap.h (bug 14912)
- Authentication-results: sourceware.org; auth=none
It was noted in
<https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> 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).
2015-09-04 Joseph Myers <joseph@codesourcery.com>
[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 <linkmap.h> instead of <bits/linkmap.h>.
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 <stdint.h>
#include <stddef.h>
-#include <bits/linkmap.h>
+#include <linkmap.h>
#include <dl-fileid.h>
#include <dl-lookupcfg.h>
#include <tls.h>
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
--
Joseph S. Myers
joseph@codesourcery.com