summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-09-04 19:44:27 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-09-04 19:44:27 +0000
commit522e02ab8a7484881ca8290c6cd245d33867d5d4 (patch)
treee603f77d871f15adcc38643be42b97afffa6e481
parentb4b522f6108e2116fb806e4f29b25542062dd84b (diff)
downloadglibc-522e02ab8a7484881ca8290c6cd245d33867d5d4.tar.gz
glibc-522e02ab8a7484881ca8290c6cd245d33867d5d4.tar.xz
glibc-522e02ab8a7484881ca8290c6cd245d33867d5d4.zip
Rename bits/linkmap.h to linkmap.h (bug 14912).
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).

	[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>.
-rw-r--r--ChangeLog23
-rw-r--r--include/link.h2
-rw-r--r--sysdeps/aarch64/linkmap.h (renamed from sysdeps/aarch64/bits/linkmap.h)0
-rw-r--r--sysdeps/arm/linkmap.h (renamed from sysdeps/arm/bits/linkmap.h)0
-rw-r--r--sysdeps/generic/linkmap.h (renamed from bits/linkmap.h)0
-rw-r--r--sysdeps/hppa/linkmap.h (renamed from sysdeps/hppa/bits/linkmap.h)0
-rw-r--r--sysdeps/ia64/linkmap.h (renamed from sysdeps/ia64/bits/linkmap.h)0
-rw-r--r--sysdeps/mips/linkmap.h (renamed from sysdeps/mips/bits/linkmap.h)0
-rw-r--r--sysdeps/s390/linkmap.h (renamed from sysdeps/s390/bits/linkmap.h)0
-rw-r--r--sysdeps/sh/linkmap.h (renamed from sysdeps/sh/bits/linkmap.h)0
-rw-r--r--sysdeps/x86/linkmap.h (renamed from sysdeps/x86/bits/linkmap.h)0
11 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 76bbb73cac..1db8e3197d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+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>.
+
 2015-09-04  Andreas Schwab  <schwab@suse.de>
 
 	[BZ #18635]
diff --git a/include/link.h b/include/link.h
index 7e7eb79f10..e44110c843 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
index 9fed9b3872..9fed9b3872 100644
--- a/sysdeps/aarch64/bits/linkmap.h
+++ b/sysdeps/aarch64/linkmap.h
diff --git a/sysdeps/arm/bits/linkmap.h b/sysdeps/arm/linkmap.h
index 7c2b4a6da8..7c2b4a6da8 100644
--- a/sysdeps/arm/bits/linkmap.h
+++ b/sysdeps/arm/linkmap.h
diff --git a/bits/linkmap.h b/sysdeps/generic/linkmap.h
index 470b4d3e5f..470b4d3e5f 100644
--- a/bits/linkmap.h
+++ b/sysdeps/generic/linkmap.h
diff --git a/sysdeps/hppa/bits/linkmap.h b/sysdeps/hppa/linkmap.h
index 54842b2299..54842b2299 100644
--- a/sysdeps/hppa/bits/linkmap.h
+++ b/sysdeps/hppa/linkmap.h
diff --git a/sysdeps/ia64/bits/linkmap.h b/sysdeps/ia64/linkmap.h
index 7f8b0550d9..7f8b0550d9 100644
--- a/sysdeps/ia64/bits/linkmap.h
+++ b/sysdeps/ia64/linkmap.h
diff --git a/sysdeps/mips/bits/linkmap.h b/sysdeps/mips/linkmap.h
index 1fb9678a6d..1fb9678a6d 100644
--- a/sysdeps/mips/bits/linkmap.h
+++ b/sysdeps/mips/linkmap.h
diff --git a/sysdeps/s390/bits/linkmap.h b/sysdeps/s390/linkmap.h
index fc1fba363a..fc1fba363a 100644
--- a/sysdeps/s390/bits/linkmap.h
+++ b/sysdeps/s390/linkmap.h
diff --git a/sysdeps/sh/bits/linkmap.h b/sysdeps/sh/linkmap.h
index bb2fbb5f16..bb2fbb5f16 100644
--- a/sysdeps/sh/bits/linkmap.h
+++ b/sysdeps/sh/linkmap.h
diff --git a/sysdeps/x86/bits/linkmap.h b/sysdeps/x86/linkmap.h
index dd0d140874..dd0d140874 100644
--- a/sysdeps/x86/bits/linkmap.h
+++ b/sysdeps/x86/linkmap.h