This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Move bits/atomic.h to atomic-arch.h (bug 14912)
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Tue, 8 Sep 2015 12:42:37 +0000
- Subject: Move bits/atomic.h to atomic-arch.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/atomic.h to atomic-arch.h to follow that
convention.
This is the only change in this series that needs to change the
filename rather than simply removing a directory level (because both
atomic.h and bits/atomic.h exist at present).
Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by the patch).
2015-09-08 Joseph Myers <joseph@codesourcery.com>
[BZ #14912]
* sysdeps/aarch64/bits/atomic.h: Move to ...
* sysdeps/aarch64/atomic-arch.h: ...here.
(_AARCH64_BITS_ATOMIC_H): Rename macro to _AARCH64_ATOMIC_ARCH_H.
* sysdeps/alpha/bits/atomic.h: Move to ...
* sysdeps/alpha/atomic-arch.h: ...here.
* sysdeps/arm/bits/atomic.h: Move to ...
* sysdeps/arm/atomic-arch.h: ...here. Update comments.
* bits/atomic.h: Move to ...
* sysdeps/generic/atomic-arch.h: ...here.
(_BITS_ATOMIC_H): Rename macro to _ATOMIC_ARCH_H.
* sysdeps/i386/bits/atomic.h: Move to ...
* sysdeps/i386/atomic-arch.h: ...here.
* sysdeps/ia64/bits/atomic.h: Move to ...
* sysdeps/ia64/atomic-arch.h: ...here.
* sysdeps/m68k/coldfire/bits/atomic.h: Move to ...
* sysdeps/m68k/coldfire/atomic-arch.h: ...here.
(_BITS_ATOMIC_H): Rename macro to _ATOMIC_ARCH_H.
* sysdeps/m68k/m680x0/m68020/bits/atomic.h: Move to ...
* sysdeps/m68k/m680x0/m68020/atomic-arch.h: ...here.
* sysdeps/microblaze/bits/atomic.h: Move to ...
* sysdeps/microblaze/atomic-arch.h: ...here.
* sysdeps/mips/bits/atomic.h: Move to ...
* sysdeps/mips/atomic-arch.h: ...here.
(_MIPS_BITS_ATOMIC_H): Rename macro to _MIPS_ATOMIC_ARCH_H.
* sysdeps/powerpc/bits/atomic.h: Move to ...
* sysdeps/powerpc/atomic-arch.h: ...here. Update comments.
* sysdeps/powerpc/powerpc32/bits/atomic.h: Move to ...
* sysdeps/powerpc/powerpc32/atomic-arch.h: ...here. Update
comments. Include <atomic-arch.h> instead of <bits/atomic.h>.
* sysdeps/powerpc/powerpc64/bits/atomic.h: Move to ...
* sysdeps/powerpc/powerpc64/atomic-arch.h: ...here. Include
<atomic-arch.h> instead of <bits/atomic.h>.
* sysdeps/s390/bits/atomic.h: Move to ...
* sysdeps/s390/atomic-arch.h: ...here.
* sysdeps/sparc/sparc32/bits/atomic.h: Move to ...
* sysdeps/sparc/sparc32/atomic-arch.h: ...here.
(_BITS_ATOMIC_H): Rename macro to _ATOMIC_ARCH_H.
* sysdeps/sparc/sparc32/sparcv9/bits/atomic.h: Move to ...
* sysdeps/sparc/sparc32/sparcv9/atomic-arch.h: ...here.
* sysdeps/sparc/sparc64/bits/atomic.h: Move to ...
* sysdeps/sparc/sparc64/atomic-arch.h: ...here.
* sysdeps/tile/bits/atomic.h: Move to ...
* sysdeps/tile/atomic-arch.h: ...here.
* sysdeps/tile/tilegx/bits/atomic.h: Move to ...
* sysdeps/tile/tilegx/atomic-arch.h: ...here. Include
<sysdeps/tile/atomic-arch.h> instead of
<sysdeps/tile/bits/atomic.h>.
(_BITS_ATOMIC_H): Rename macro to _ATOMIC_ARCH_H.
* sysdeps/tile/tilepro/bits/atomic.h: Move to ...
* sysdeps/tile/tilepro/atomic-arch.h: ...here. Include
<sysdeps/tile/atomic-arch.h> instead of
<sysdeps/tile/bits/atomic.h>.
(_BITS_ATOMIC_H): Rename macro to _ATOMIC_ARCH_H.
* sysdeps/unix/sysv/linux/arm/bits/atomic.h: Move to ...
* sysdeps/unix/sysv/linux/arm/atomic-arch.h: ...here. Include
<sysdeps/arm/atomic-arch.h> instead of
<sysdeps/arm/bits/atomic.h>.
* sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Move to ...
* sysdeps/unix/sysv/linux/hppa/atomic-arch.h: ...here.
(_BITS_ATOMIC_H): Rename macro to _ATOMIC_ARCH_H.
* sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: Move to ...
* sysdeps/unix/sysv/linux/m68k/coldfire/atomic-arch.h: ...here.
(_BITS_ATOMIC_H): Rename macro to _ATOMIC_ARCH_H.
* sysdeps/unix/sysv/linux/nios2/bits/atomic.h: Move to ...
* sysdeps/unix/sysv/linux/nios2/atomic-arch.h: ...here.
(_NIOS2_BITS_ATOMIC_H): Rename macro to _NIOS2_ATOMIC_ARCH_H.
* sysdeps/unix/sysv/linux/sh/bits/atomic.h: Move to ...
* sysdeps/unix/sysv/linux/sh/atomic-arch.h: ...here.
* sysdeps/x86_64/bits/atomic.h: Move to ...
* sysdeps/x86_64/atomic-arch.h: ...here.
* include/atomic.h: Include <atomic-arch.h> instead of
<bits/atomic.h>.
diff --git a/include/atomic.h b/include/atomic.h
index 221bea0..59c6b8a 100644
--- a/include/atomic.h
+++ b/include/atomic.h
@@ -47,7 +47,7 @@
#include <stdlib.h>
-#include <bits/atomic.h>
+#include <atomic-arch.h>
/* Wrapper macros to call pre_NN_post (mem, ...) where NN is the
bit width of *MEM. The calling macro puts parens around MEM
diff --git a/sysdeps/aarch64/bits/atomic.h b/sysdeps/aarch64/atomic-arch.h
similarity index 98%
rename from sysdeps/aarch64/bits/atomic.h
rename to sysdeps/aarch64/atomic-arch.h
index fdd5eaa..4e4832e 100644
--- a/sysdeps/aarch64/bits/atomic.h
+++ b/sysdeps/aarch64/atomic-arch.h
@@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _AARCH64_BITS_ATOMIC_H
-#define _AARCH64_BITS_ATOMIC_H 1
+#ifndef _AARCH64_ATOMIC_ARCH_H
+#define _AARCH64_ATOMIC_ARCH_H 1
#include <stdint.h>
diff --git a/sysdeps/alpha/bits/atomic.h b/sysdeps/alpha/atomic-arch.h
similarity index 100%
rename from sysdeps/alpha/bits/atomic.h
rename to sysdeps/alpha/atomic-arch.h
diff --git a/sysdeps/arm/bits/atomic.h b/sysdeps/arm/atomic-arch.h
similarity index 98%
rename from sysdeps/arm/bits/atomic.h
rename to sysdeps/arm/atomic-arch.h
index 772a354..d6febf9 100644
--- a/sysdeps/arm/bits/atomic.h
+++ b/sysdeps/arm/atomic-arch.h
@@ -44,7 +44,7 @@ void __arm_link_error (void);
# define atomic_full_barrier() __arm_assisted_full_barrier ()
#endif
-/* An OS-specific bits/atomic.h file will define this macro if
+/* An OS-specific atomic-arch.h file will define this macro if
the OS can provide something. If not, we'll fail to build
with a compiler that doesn't supply the operation. */
#ifndef __arm_assisted_full_barrier
@@ -153,7 +153,7 @@ void __arm_link_error (void);
({ __arm_link_error (); oldval; })
#endif
-/* An OS-specific bits/atomic.h file will define this macro if
+/* An OS-specific atomic-arch.h file will define this macro if
the OS can provide something. If not, we'll fail to build
with a compiler that doesn't supply the operation. */
#ifndef __arm_assisted_compare_and_exchange_val_32_acq
diff --git a/bits/atomic.h b/sysdeps/generic/atomic-arch.h
similarity index 95%
rename from bits/atomic.h
rename to sysdeps/generic/atomic-arch.h
index 0a7b9c5..b85b0c2 100644
--- a/bits/atomic.h
+++ b/sysdeps/generic/atomic-arch.h
@@ -16,8 +16,8 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_ATOMIC_H
-#define _BITS_ATOMIC_H 1
+#ifndef _ATOMIC_ARCH_H
+#define _ATOMIC_ARCH_H 1
/* We have by default no support for atomic operations. So define
them non-atomic. If this is a problem somebody will have to come
@@ -39,4 +39,4 @@
\
*__gmemp == (oldval) ? (*__gmemp = __gnewval, 0) : 1; })
-#endif /* bits/atomic.h */
+#endif /* atomic-arch.h */
diff --git a/sysdeps/i386/bits/atomic.h b/sysdeps/i386/atomic-arch.h
similarity index 100%
rename from sysdeps/i386/bits/atomic.h
rename to sysdeps/i386/atomic-arch.h
diff --git a/sysdeps/ia64/bits/atomic.h b/sysdeps/ia64/atomic-arch.h
similarity index 100%
rename from sysdeps/ia64/bits/atomic.h
rename to sysdeps/ia64/atomic-arch.h
diff --git a/sysdeps/m68k/coldfire/bits/atomic.h b/sysdeps/m68k/coldfire/atomic-arch.h
similarity index 98%
rename from sysdeps/m68k/coldfire/bits/atomic.h
rename to sysdeps/m68k/coldfire/atomic-arch.h
index c09bf18..597f79a 100644
--- a/sysdeps/m68k/coldfire/bits/atomic.h
+++ b/sysdeps/m68k/coldfire/atomic-arch.h
@@ -15,8 +15,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_ATOMIC_H
-#define _BITS_ATOMIC_H 1
+#ifndef _ATOMIC_ARCH_H
+#define _ATOMIC_ARCH_H 1
#include <stdint.h>
diff --git a/sysdeps/m68k/m680x0/m68020/bits/atomic.h b/sysdeps/m68k/m680x0/m68020/atomic-arch.h
similarity index 100%
rename from sysdeps/m68k/m680x0/m68020/bits/atomic.h
rename to sysdeps/m68k/m680x0/m68020/atomic-arch.h
diff --git a/sysdeps/microblaze/bits/atomic.h b/sysdeps/microblaze/atomic-arch.h
similarity index 100%
rename from sysdeps/microblaze/bits/atomic.h
rename to sysdeps/microblaze/atomic-arch.h
diff --git a/sysdeps/mips/bits/atomic.h b/sysdeps/mips/atomic-arch.h
similarity index 99%
rename from sysdeps/mips/bits/atomic.h
rename to sysdeps/mips/atomic-arch.h
index a391881..91627f9 100644
--- a/sysdeps/mips/bits/atomic.h
+++ b/sysdeps/mips/atomic-arch.h
@@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _MIPS_BITS_ATOMIC_H
-#define _MIPS_BITS_ATOMIC_H 1
+#ifndef _MIPS_ATOMIC_ARCH_H
+#define _MIPS_ATOMIC_ARCH_H 1
#include <stdint.h>
#include <inttypes.h>
@@ -500,4 +500,4 @@ typedef uintmax_t uatomic_max_t;
".set pop" : : : "memory")
#endif /* !__mips16 */
-#endif /* bits/atomic.h */
+#endif /* atomic-arch.h */
diff --git a/sysdeps/powerpc/bits/atomic.h b/sysdeps/powerpc/atomic-arch.h
similarity index 98%
rename from sysdeps/powerpc/bits/atomic.h
rename to sysdeps/powerpc/atomic-arch.h
index 8ca45ee..7a68d12 100644
--- a/sysdeps/powerpc/bits/atomic.h
+++ b/sysdeps/powerpc/atomic-arch.h
@@ -18,11 +18,11 @@
<http://www.gnu.org/licenses/>. */
/*
- * Never include sysdeps/powerpc/bits/atomic.h directly.
+ * Never include sysdeps/powerpc/atomic-arch.h directly.
* Alway use include/atomic.h which will include either
- * sysdeps/powerpc/powerpc32/bits/atomic.h
+ * sysdeps/powerpc/powerpc32/atomic-arch.h
* or
- * sysdeps/powerpc/powerpc64/bits/atomic.h
+ * sysdeps/powerpc/powerpc64/atomic-arch.h
* as appropriate and which in turn include this file.
*/
diff --git a/sysdeps/powerpc/powerpc32/bits/atomic.h b/sysdeps/powerpc/powerpc32/atomic-arch.h
similarity index 98%
rename from sysdeps/powerpc/powerpc32/bits/atomic.h
rename to sysdeps/powerpc/powerpc32/atomic-arch.h
index 8cb0627..98c5c54 100644
--- a/sysdeps/powerpc/powerpc32/bits/atomic.h
+++ b/sysdeps/powerpc/powerpc32/atomic-arch.h
@@ -40,7 +40,7 @@
* The 32-bit exchange_bool is different on powerpc64 because the subf
* does signed 64-bit arithmetic while the lwarx is 32-bit unsigned
* (a load word and zero (high 32) form). So powerpc64 has a slightly
- * different version in sysdeps/powerpc/powerpc64/bits/atomic.h.
+ * different version in sysdeps/powerpc/powerpc64/atomic-arch.h.
*/
#define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \
({ \
@@ -141,4 +141,4 @@
* Include the rest of the atomic ops macros which are common to both
* powerpc32 and powerpc64.
*/
-#include_next <bits/atomic.h>
+#include_next <atomic-arch.h>
diff --git a/sysdeps/powerpc/powerpc64/bits/atomic.h b/sysdeps/powerpc/powerpc64/atomic-arch.h
similarity index 99%
rename from sysdeps/powerpc/powerpc64/bits/atomic.h
rename to sysdeps/powerpc/powerpc64/atomic-arch.h
index 92a2a3d..b667495 100644
--- a/sysdeps/powerpc/powerpc64/bits/atomic.h
+++ b/sysdeps/powerpc/powerpc64/atomic-arch.h
@@ -271,4 +271,4 @@
* Include the rest of the atomic ops macros which are common to both
* powerpc32 and powerpc64.
*/
-#include_next <bits/atomic.h>
+#include_next <atomic-arch.h>
diff --git a/sysdeps/s390/bits/atomic.h b/sysdeps/s390/atomic-arch.h
similarity index 100%
rename from sysdeps/s390/bits/atomic.h
rename to sysdeps/s390/atomic-arch.h
diff --git a/sysdeps/sparc/sparc32/bits/atomic.h b/sysdeps/sparc/sparc32/atomic-arch.h
similarity index 99%
rename from sysdeps/sparc/sparc32/bits/atomic.h
rename to sysdeps/sparc/sparc32/atomic-arch.h
index 4242ba8..c88609e 100644
--- a/sysdeps/sparc/sparc32/bits/atomic.h
+++ b/sysdeps/sparc/sparc32/atomic-arch.h
@@ -17,8 +17,8 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_ATOMIC_H
-#define _BITS_ATOMIC_H 1
+#ifndef _ATOMIC_ARCH_H
+#define _ATOMIC_ARCH_H 1
#include <stdint.h>
@@ -357,4 +357,4 @@ extern uint64_t _dl_hwcap __attribute__((weak));
#include <sysdep.h>
-#endif /* bits/atomic.h */
+#endif /* atomic-arch.h */
diff --git a/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h b/sysdeps/sparc/sparc32/sparcv9/atomic-arch.h
similarity index 100%
rename from sysdeps/sparc/sparc32/sparcv9/bits/atomic.h
rename to sysdeps/sparc/sparc32/sparcv9/atomic-arch.h
diff --git a/sysdeps/sparc/sparc64/bits/atomic.h b/sysdeps/sparc/sparc64/atomic-arch.h
similarity index 100%
rename from sysdeps/sparc/sparc64/bits/atomic.h
rename to sysdeps/sparc/sparc64/atomic-arch.h
diff --git a/sysdeps/tile/bits/atomic.h b/sysdeps/tile/atomic-arch.h
similarity index 100%
rename from sysdeps/tile/bits/atomic.h
rename to sysdeps/tile/atomic-arch.h
diff --git a/sysdeps/tile/tilegx/bits/atomic.h b/sysdeps/tile/tilegx/atomic-arch.h
similarity index 95%
rename from sysdeps/tile/tilegx/bits/atomic.h
rename to sysdeps/tile/tilegx/atomic-arch.h
index e75efb1..cb5ebdd 100644
--- a/sysdeps/tile/tilegx/bits/atomic.h
+++ b/sysdeps/tile/tilegx/atomic-arch.h
@@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_ATOMIC_H
-#define _BITS_ATOMIC_H 1
+#ifndef _ATOMIC_ARCH_H
+#define _ATOMIC_ARCH_H 1
#include <arch/spr_def.h>
@@ -55,6 +55,6 @@
#define atomic_decrement_if_positive(mem) \
__atomic_update (mem, -1, fetchaddgez)
-#include <sysdeps/tile/bits/atomic.h>
+#include <sysdeps/tile/atomic-arch.h>
-#endif /* bits/atomic.h */
+#endif /* atomic-arch.h */
diff --git a/sysdeps/tile/tilepro/bits/atomic.h b/sysdeps/tile/tilepro/atomic-arch.h
similarity index 96%
rename from sysdeps/tile/tilepro/bits/atomic.h
rename to sysdeps/tile/tilepro/atomic-arch.h
index e0ef9fb..5c3687e 100644
--- a/sysdeps/tile/tilepro/bits/atomic.h
+++ b/sysdeps/tile/tilepro/atomic-arch.h
@@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_ATOMIC_H
-#define _BITS_ATOMIC_H 1
+#ifndef _ATOMIC_ARCH_H
+#define _ATOMIC_ARCH_H 1
#include <asm/unistd.h>
@@ -83,6 +83,6 @@ int __atomic_update_32 (volatile int *mem, int mask, int addend)
({ __typeof (mask) __att1_v = (mask); \
__atomic_update ((mem), ~__att1_v, __att1_v); })
-#include <sysdeps/tile/bits/atomic.h>
+#include <sysdeps/tile/atomic-arch.h>
-#endif /* bits/atomic.h */
+#endif /* atomic-arch.h */
diff --git a/sysdeps/unix/sysv/linux/arm/bits/atomic.h b/sysdeps/unix/sysv/linux/arm/atomic-arch.h
similarity index 99%
rename from sysdeps/unix/sysv/linux/arm/bits/atomic.h
rename to sysdeps/unix/sysv/linux/arm/atomic-arch.h
index 17cff54..f00056f 100644
--- a/sysdeps/unix/sysv/linux/arm/bits/atomic.h
+++ b/sysdeps/unix/sysv/linux/arm/atomic-arch.h
@@ -104,4 +104,4 @@
(__typeof (oldval)) a_tmp; })
#endif
-#include <sysdeps/arm/bits/atomic.h>
+#include <sysdeps/arm/atomic-arch.h>
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/atomic.h b/sysdeps/unix/sysv/linux/hppa/atomic-arch.h
similarity index 98%
rename from sysdeps/unix/sysv/linux/hppa/bits/atomic.h
rename to sysdeps/unix/sysv/linux/hppa/atomic-arch.h
index 26b66c5..db70d52 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/atomic.h
+++ b/sysdeps/unix/sysv/linux/hppa/atomic-arch.h
@@ -25,8 +25,8 @@
#define ENOSYS 251
#endif
-#ifndef _BITS_ATOMIC_H
-#define _BITS_ATOMIC_H 1
+#ifndef _ATOMIC_ARCH_H
+#define _ATOMIC_ARCH_H 1
typedef int8_t atomic8_t;
typedef uint8_t uatomic8_t;
@@ -100,4 +100,4 @@ typedef uintmax_t uatomic_max_t;
})
#endif
-/* _BITS_ATOMIC_H */
+/* _ATOMIC_ARCH_H */
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h b/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-arch.h
similarity index 98%
rename from sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h
rename to sysdeps/unix/sysv/linux/m68k/coldfire/atomic-arch.h
index 16002f1..bc52cb8 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-arch.h
@@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_ATOMIC_H
-#define _BITS_ATOMIC_H 1
+#ifndef _ATOMIC_ARCH_H
+#define _ATOMIC_ARCH_H 1
#include <stdint.h>
#include <sysdep.h>
diff --git a/sysdeps/unix/sysv/linux/nios2/bits/atomic.h b/sysdeps/unix/sysv/linux/nios2/atomic-arch.h
similarity index 97%
rename from sysdeps/unix/sysv/linux/nios2/bits/atomic.h
rename to sysdeps/unix/sysv/linux/nios2/atomic-arch.h
index 2329f74..34dd081 100644
--- a/sysdeps/unix/sysv/linux/nios2/bits/atomic.h
+++ b/sysdeps/unix/sysv/linux/nios2/atomic-arch.h
@@ -16,8 +16,8 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _NIOS2_BITS_ATOMIC_H
-#define _NIOS2_BITS_ATOMIC_H 1
+#ifndef _NIOS2_ATOMIC_ARCH_H
+#define _NIOS2_ATOMIC_ARCH_H 1
#include <stdint.h>
@@ -89,4 +89,4 @@ typedef uintmax_t uatomic_max_t;
#define atomic_full_barrier() ({ asm volatile ("sync"); })
-#endif /* _NIOS2_BITS_ATOMIC_H */
+#endif /* _NIOS2_ATOMIC_ARCH_H */
diff --git a/sysdeps/unix/sysv/linux/sh/bits/atomic.h b/sysdeps/unix/sysv/linux/sh/atomic-arch.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/sh/bits/atomic.h
rename to sysdeps/unix/sysv/linux/sh/atomic-arch.h
diff --git a/sysdeps/x86_64/bits/atomic.h b/sysdeps/x86_64/atomic-arch.h
similarity index 100%
rename from sysdeps/x86_64/bits/atomic.h
rename to sysdeps/x86_64/atomic-arch.h
--
Joseph S. Myers
joseph@codesourcery.com