From de071d199a8578055edf2722114788ae749823aa Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 11 Sep 2015 20:00:19 +0000 Subject: [PATCH] Move bits/atomic.h to atomic-machine.h (bug 14912). It was noted in that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/atomic.h to atomic-machine.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). [BZ #14912] * sysdeps/aarch64/bits/atomic.h: Move to ... * sysdeps/aarch64/atomic-machine.h: ...here. (_AARCH64_BITS_ATOMIC_H): Rename macro to _AARCH64_ATOMIC_MACHINE_H. * sysdeps/alpha/bits/atomic.h: Move to ... * sysdeps/alpha/atomic-machine.h: ...here. * sysdeps/arm/bits/atomic.h: Move to ... * sysdeps/arm/atomic-machine.h: ...here. Update comments. * bits/atomic.h: Move to ... * sysdeps/generic/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/i386/bits/atomic.h: Move to ... * sysdeps/i386/atomic-machine.h: ...here. * sysdeps/ia64/bits/atomic.h: Move to ... * sysdeps/ia64/atomic-machine.h: ...here. * sysdeps/m68k/coldfire/bits/atomic.h: Move to ... * sysdeps/m68k/coldfire/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/m68k/m680x0/m68020/bits/atomic.h: Move to ... * sysdeps/m68k/m680x0/m68020/atomic-machine.h: ...here. * sysdeps/microblaze/bits/atomic.h: Move to ... * sysdeps/microblaze/atomic-machine.h: ...here. * sysdeps/mips/bits/atomic.h: Move to ... * sysdeps/mips/atomic-machine.h: ...here. (_MIPS_BITS_ATOMIC_H): Rename macro to _MIPS_ATOMIC_MACHINE_H. * sysdeps/powerpc/bits/atomic.h: Move to ... * sysdeps/powerpc/atomic-machine.h: ...here. Update comments. * sysdeps/powerpc/powerpc32/bits/atomic.h: Move to ... * sysdeps/powerpc/powerpc32/atomic-machine.h: ...here. Update comments. Include instead of . * sysdeps/powerpc/powerpc64/bits/atomic.h: Move to ... * sysdeps/powerpc/powerpc64/atomic-machine.h: ...here. Include instead of . * sysdeps/s390/bits/atomic.h: Move to ... * sysdeps/s390/atomic-machine.h: ...here. * sysdeps/sparc/sparc32/bits/atomic.h: Move to ... * sysdeps/sparc/sparc32/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/sparc/sparc32/sparcv9/bits/atomic.h: Move to ... * sysdeps/sparc/sparc32/sparcv9/atomic-machine.h: ...here. * sysdeps/sparc/sparc64/bits/atomic.h: Move to ... * sysdeps/sparc/sparc64/atomic-machine.h: ...here. * sysdeps/tile/bits/atomic.h: Move to ... * sysdeps/tile/atomic-machine.h: ...here. * sysdeps/tile/tilegx/bits/atomic.h: Move to ... * sysdeps/tile/tilegx/atomic-machine.h: ...here. Include instead of . (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/tile/tilepro/bits/atomic.h: Move to ... * sysdeps/tile/tilepro/atomic-machine.h: ...here. Include instead of . (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/unix/sysv/linux/arm/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/arm/atomic-machine.h: ...here. Include instead of . * sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/hppa/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h: ...here. (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. * sysdeps/unix/sysv/linux/nios2/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/nios2/atomic-machine.h: ...here. (_NIOS2_BITS_ATOMIC_H): Rename macro to _NIOS2_ATOMIC_MACHINE_H. * sysdeps/unix/sysv/linux/sh/bits/atomic.h: Move to ... * sysdeps/unix/sysv/linux/sh/atomic-machine.h: ...here. * sysdeps/x86_64/bits/atomic.h: Move to ... * sysdeps/x86_64/atomic-machine.h: ...here. * include/atomic.h: Include instead of . --- ChangeLog | 75 +++++++++++++++++++ NEWS | 10 +-- include/atomic.h | 2 +- .../{bits/atomic.h => atomic-machine.h} | 4 +- .../alpha/{bits/atomic.h => atomic-machine.h} | 0 .../arm/{bits/atomic.h => atomic-machine.h} | 4 +- .../generic/atomic-machine.h | 6 +- .../i386/{bits/atomic.h => atomic-machine.h} | 0 .../ia64/{bits/atomic.h => atomic-machine.h} | 0 .../{bits/atomic.h => atomic-machine.h} | 4 +- .../{bits/atomic.h => atomic-machine.h} | 0 .../{bits/atomic.h => atomic-machine.h} | 0 .../mips/{bits/atomic.h => atomic-machine.h} | 6 +- .../{bits/atomic.h => atomic-machine.h} | 6 +- .../{bits/atomic.h => atomic-machine.h} | 4 +- .../{bits/atomic.h => atomic-machine.h} | 2 +- .../s390/{bits/atomic.h => atomic-machine.h} | 0 .../{bits/atomic.h => atomic-machine.h} | 6 +- .../{bits/atomic.h => atomic-machine.h} | 0 .../{bits/atomic.h => atomic-machine.h} | 0 .../tile/{bits/atomic.h => atomic-machine.h} | 0 .../{bits/atomic.h => atomic-machine.h} | 8 +- .../{bits/atomic.h => atomic-machine.h} | 8 +- .../arm/{bits/atomic.h => atomic-machine.h} | 2 +- .../hppa/{bits/atomic.h => atomic-machine.h} | 6 +- .../{bits/atomic.h => atomic-machine.h} | 4 +- .../nios2/{bits/atomic.h => atomic-machine.h} | 6 +- .../sh/{bits/atomic.h => atomic-machine.h} | 0 .../{bits/atomic.h => atomic-machine.h} | 0 29 files changed, 119 insertions(+), 44 deletions(-) rename sysdeps/aarch64/{bits/atomic.h => atomic-machine.h} (98%) rename sysdeps/alpha/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/arm/{bits/atomic.h => atomic-machine.h} (97%) rename bits/atomic.h => sysdeps/generic/atomic-machine.h (95%) rename sysdeps/i386/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/ia64/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/m68k/coldfire/{bits/atomic.h => atomic-machine.h} (97%) rename sysdeps/m68k/m680x0/m68020/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/microblaze/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/mips/{bits/atomic.h => atomic-machine.h} (99%) rename sysdeps/powerpc/{bits/atomic.h => atomic-machine.h} (98%) rename sysdeps/powerpc/powerpc32/{bits/atomic.h => atomic-machine.h} (98%) rename sysdeps/powerpc/powerpc64/{bits/atomic.h => atomic-machine.h} (99%) rename sysdeps/s390/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/sparc/sparc32/{bits/atomic.h => atomic-machine.h} (99%) rename sysdeps/sparc/sparc32/sparcv9/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/sparc/sparc64/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/tile/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/tile/tilegx/{bits/atomic.h => atomic-machine.h} (94%) rename sysdeps/tile/tilepro/{bits/atomic.h => atomic-machine.h} (96%) rename sysdeps/unix/sysv/linux/arm/{bits/atomic.h => atomic-machine.h} (99%) rename sysdeps/unix/sysv/linux/hppa/{bits/atomic.h => atomic-machine.h} (97%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{bits/atomic.h => atomic-machine.h} (98%) rename sysdeps/unix/sysv/linux/nios2/{bits/atomic.h => atomic-machine.h} (96%) rename sysdeps/unix/sysv/linux/sh/{bits/atomic.h => atomic-machine.h} (100%) rename sysdeps/x86_64/{bits/atomic.h => atomic-machine.h} (100%) diff --git a/ChangeLog b/ChangeLog index f00b277488..ca4db618c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,80 @@ 2015-09-11 Joseph Myers + [BZ #14912] + * sysdeps/aarch64/bits/atomic.h: Move to ... + * sysdeps/aarch64/atomic-machine.h: ...here. + (_AARCH64_BITS_ATOMIC_H): Rename macro to + _AARCH64_ATOMIC_MACHINE_H. + * sysdeps/alpha/bits/atomic.h: Move to ... + * sysdeps/alpha/atomic-machine.h: ...here. + * sysdeps/arm/bits/atomic.h: Move to ... + * sysdeps/arm/atomic-machine.h: ...here. Update comments. + * bits/atomic.h: Move to ... + * sysdeps/generic/atomic-machine.h: ...here. + (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. + * sysdeps/i386/bits/atomic.h: Move to ... + * sysdeps/i386/atomic-machine.h: ...here. + * sysdeps/ia64/bits/atomic.h: Move to ... + * sysdeps/ia64/atomic-machine.h: ...here. + * sysdeps/m68k/coldfire/bits/atomic.h: Move to ... + * sysdeps/m68k/coldfire/atomic-machine.h: ...here. + (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. + * sysdeps/m68k/m680x0/m68020/bits/atomic.h: Move to ... + * sysdeps/m68k/m680x0/m68020/atomic-machine.h: ...here. + * sysdeps/microblaze/bits/atomic.h: Move to ... + * sysdeps/microblaze/atomic-machine.h: ...here. + * sysdeps/mips/bits/atomic.h: Move to ... + * sysdeps/mips/atomic-machine.h: ...here. + (_MIPS_BITS_ATOMIC_H): Rename macro to _MIPS_ATOMIC_MACHINE_H. + * sysdeps/powerpc/bits/atomic.h: Move to ... + * sysdeps/powerpc/atomic-machine.h: ...here. Update comments. + * sysdeps/powerpc/powerpc32/bits/atomic.h: Move to ... + * sysdeps/powerpc/powerpc32/atomic-machine.h: ...here. Update + comments. Include instead of . + * sysdeps/powerpc/powerpc64/bits/atomic.h: Move to ... + * sysdeps/powerpc/powerpc64/atomic-machine.h: ...here. Include + instead of . + * sysdeps/s390/bits/atomic.h: Move to ... + * sysdeps/s390/atomic-machine.h: ...here. + * sysdeps/sparc/sparc32/bits/atomic.h: Move to ... + * sysdeps/sparc/sparc32/atomic-machine.h: ...here. + (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. + * sysdeps/sparc/sparc32/sparcv9/bits/atomic.h: Move to ... + * sysdeps/sparc/sparc32/sparcv9/atomic-machine.h: ...here. + * sysdeps/sparc/sparc64/bits/atomic.h: Move to ... + * sysdeps/sparc/sparc64/atomic-machine.h: ...here. + * sysdeps/tile/bits/atomic.h: Move to ... + * sysdeps/tile/atomic-machine.h: ...here. + * sysdeps/tile/tilegx/bits/atomic.h: Move to ... + * sysdeps/tile/tilegx/atomic-machine.h: ...here. Include + instead of + . + (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. + * sysdeps/tile/tilepro/bits/atomic.h: Move to ... + * sysdeps/tile/tilepro/atomic-machine.h: ...here. Include + instead of + . + (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. + * sysdeps/unix/sysv/linux/arm/bits/atomic.h: Move to ... + * sysdeps/unix/sysv/linux/arm/atomic-machine.h: ...here. Include + instead of + . + * sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Move to ... + * sysdeps/unix/sysv/linux/hppa/atomic-machine.h: ...here. + (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. + * sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: Move to ... + * sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h: ...here. + (_BITS_ATOMIC_H): Rename macro to _ATOMIC_MACHINE_H. + * sysdeps/unix/sysv/linux/nios2/bits/atomic.h: Move to ... + * sysdeps/unix/sysv/linux/nios2/atomic-machine.h: ...here. + (_NIOS2_BITS_ATOMIC_H): Rename macro to _NIOS2_ATOMIC_MACHINE_H. + * sysdeps/unix/sysv/linux/sh/bits/atomic.h: Move to ... + * sysdeps/unix/sysv/linux/sh/atomic-machine.h: ...here. + * sysdeps/x86_64/bits/atomic.h: Move to ... + * sysdeps/x86_64/atomic-machine.h: ...here. + * include/atomic.h: Include instead of + . + * sysdeps/mips/mips32/libm-test-ulps: Update. * sysdeps/mips/mips64/libm-test-ulps: Likewise. diff --git a/NEWS b/NEWS index 65e706c9da..8b8a0b4c95 100644 --- a/NEWS +++ b/NEWS @@ -9,11 +9,11 @@ Version 2.23 * The following bugs are resolved with this release: - 2542, 2543, 2558, 2898, 14341, 15786, 16141, 16517, 16519, 16520, 16734, - 16973, 17787, 17905, 18084, 18086, 18240, 18265, 18370, 18421, 18480, - 18525, 18610, 18618, 18647, 18661, 18674, 18675, 18681, 18757, 18778, - 18781, 18787, 18789, 18790, 18795, 18796, 18820, 18823, 18824, 18863, - 18870, 18873, 18887, 18921, 18952. + 2542, 2543, 2558, 2898, 14341, 14912, 15786, 16141, 16517, 16519, 16520, + 16734, 16973, 17787, 17905, 18084, 18086, 18240, 18265, 18370, 18421, + 18480, 18525, 18610, 18618, 18647, 18661, 18674, 18675, 18681, 18757, + 18778, 18781, 18787, 18789, 18790, 18795, 18796, 18820, 18823, 18824, + 18863, 18870, 18873, 18887, 18921, 18952. * The obsolete header has been removed. Programs that require this header must be updated to use instead. diff --git a/include/atomic.h b/include/atomic.h index 221bea0ad3..d492ef2fd1 100644 --- a/include/atomic.h +++ b/include/atomic.h @@ -47,7 +47,7 @@ #include -#include +#include /* 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-machine.h similarity index 98% rename from sysdeps/aarch64/bits/atomic.h rename to sysdeps/aarch64/atomic-machine.h index fdd5eaa517..3758dd7b7e 100644 --- a/sysdeps/aarch64/bits/atomic.h +++ b/sysdeps/aarch64/atomic-machine.h @@ -16,8 +16,8 @@ License along with the GNU C Library. If not, see . */ -#ifndef _AARCH64_BITS_ATOMIC_H -#define _AARCH64_BITS_ATOMIC_H 1 +#ifndef _AARCH64_ATOMIC_MACHINE_H +#define _AARCH64_ATOMIC_MACHINE_H 1 #include diff --git a/sysdeps/alpha/bits/atomic.h b/sysdeps/alpha/atomic-machine.h similarity index 100% rename from sysdeps/alpha/bits/atomic.h rename to sysdeps/alpha/atomic-machine.h diff --git a/sysdeps/arm/bits/atomic.h b/sysdeps/arm/atomic-machine.h similarity index 97% rename from sysdeps/arm/bits/atomic.h rename to sysdeps/arm/atomic-machine.h index 772a354d44..2a89a73f5b 100644 --- a/sysdeps/arm/bits/atomic.h +++ b/sysdeps/arm/atomic-machine.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-machine.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-machine.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-machine.h similarity index 95% rename from bits/atomic.h rename to sysdeps/generic/atomic-machine.h index 0a7b9c5a9f..c51f3ef5b0 100644 --- a/bits/atomic.h +++ b/sysdeps/generic/atomic-machine.h @@ -16,8 +16,8 @@ License along with the GNU C Library; if not, see . */ -#ifndef _BITS_ATOMIC_H -#define _BITS_ATOMIC_H 1 +#ifndef _ATOMIC_MACHINE_H +#define _ATOMIC_MACHINE_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-machine.h */ diff --git a/sysdeps/i386/bits/atomic.h b/sysdeps/i386/atomic-machine.h similarity index 100% rename from sysdeps/i386/bits/atomic.h rename to sysdeps/i386/atomic-machine.h diff --git a/sysdeps/ia64/bits/atomic.h b/sysdeps/ia64/atomic-machine.h similarity index 100% rename from sysdeps/ia64/bits/atomic.h rename to sysdeps/ia64/atomic-machine.h diff --git a/sysdeps/m68k/coldfire/bits/atomic.h b/sysdeps/m68k/coldfire/atomic-machine.h similarity index 97% rename from sysdeps/m68k/coldfire/bits/atomic.h rename to sysdeps/m68k/coldfire/atomic-machine.h index c09bf188ac..48899ce5ed 100644 --- a/sysdeps/m68k/coldfire/bits/atomic.h +++ b/sysdeps/m68k/coldfire/atomic-machine.h @@ -15,8 +15,8 @@ License along with the GNU C Library. If not, see . */ -#ifndef _BITS_ATOMIC_H -#define _BITS_ATOMIC_H 1 +#ifndef _ATOMIC_MACHINE_H +#define _ATOMIC_MACHINE_H 1 #include diff --git a/sysdeps/m68k/m680x0/m68020/bits/atomic.h b/sysdeps/m68k/m680x0/m68020/atomic-machine.h similarity index 100% rename from sysdeps/m68k/m680x0/m68020/bits/atomic.h rename to sysdeps/m68k/m680x0/m68020/atomic-machine.h diff --git a/sysdeps/microblaze/bits/atomic.h b/sysdeps/microblaze/atomic-machine.h similarity index 100% rename from sysdeps/microblaze/bits/atomic.h rename to sysdeps/microblaze/atomic-machine.h diff --git a/sysdeps/mips/bits/atomic.h b/sysdeps/mips/atomic-machine.h similarity index 99% rename from sysdeps/mips/bits/atomic.h rename to sysdeps/mips/atomic-machine.h index 375448957c..6db8fee1d4 100644 --- a/sysdeps/mips/bits/atomic.h +++ b/sysdeps/mips/atomic-machine.h @@ -16,8 +16,8 @@ License along with the GNU C Library. If not, see . */ -#ifndef _MIPS_BITS_ATOMIC_H -#define _MIPS_BITS_ATOMIC_H 1 +#ifndef _MIPS_ATOMIC_MACHINE_H +#define _MIPS_ATOMIC_MACHINE_H 1 #include #include @@ -500,4 +500,4 @@ typedef uintmax_t uatomic_max_t; ".set pop" : : : "memory") #endif /* !__mips16 */ -#endif /* bits/atomic.h */ +#endif /* atomic-machine.h */ diff --git a/sysdeps/powerpc/bits/atomic.h b/sysdeps/powerpc/atomic-machine.h similarity index 98% rename from sysdeps/powerpc/bits/atomic.h rename to sysdeps/powerpc/atomic-machine.h index 8ca45ee5ee..a056eb18c4 100644 --- a/sysdeps/powerpc/bits/atomic.h +++ b/sysdeps/powerpc/atomic-machine.h @@ -18,11 +18,11 @@ . */ /* - * Never include sysdeps/powerpc/bits/atomic.h directly. + * Never include sysdeps/powerpc/atomic-machine.h directly. * Alway use include/atomic.h which will include either - * sysdeps/powerpc/powerpc32/bits/atomic.h + * sysdeps/powerpc/powerpc32/atomic-machine.h * or - * sysdeps/powerpc/powerpc64/bits/atomic.h + * sysdeps/powerpc/powerpc64/atomic-machine.h * as appropriate and which in turn include this file. */ diff --git a/sysdeps/powerpc/powerpc32/bits/atomic.h b/sysdeps/powerpc/powerpc32/atomic-machine.h similarity index 98% rename from sysdeps/powerpc/powerpc32/bits/atomic.h rename to sysdeps/powerpc/powerpc32/atomic-machine.h index 8cb0627ca9..9ff70c54d5 100644 --- a/sysdeps/powerpc/powerpc32/bits/atomic.h +++ b/sysdeps/powerpc/powerpc32/atomic-machine.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-machine.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 +#include_next diff --git a/sysdeps/powerpc/powerpc64/bits/atomic.h b/sysdeps/powerpc/powerpc64/atomic-machine.h similarity index 99% rename from sysdeps/powerpc/powerpc64/bits/atomic.h rename to sysdeps/powerpc/powerpc64/atomic-machine.h index 92a2a3df55..e1d3e9bb0d 100644 --- a/sysdeps/powerpc/powerpc64/bits/atomic.h +++ b/sysdeps/powerpc/powerpc64/atomic-machine.h @@ -271,4 +271,4 @@ * Include the rest of the atomic ops macros which are common to both * powerpc32 and powerpc64. */ -#include_next +#include_next diff --git a/sysdeps/s390/bits/atomic.h b/sysdeps/s390/atomic-machine.h similarity index 100% rename from sysdeps/s390/bits/atomic.h rename to sysdeps/s390/atomic-machine.h diff --git a/sysdeps/sparc/sparc32/bits/atomic.h b/sysdeps/sparc/sparc32/atomic-machine.h similarity index 99% rename from sysdeps/sparc/sparc32/bits/atomic.h rename to sysdeps/sparc/sparc32/atomic-machine.h index 4242ba831a..0fb1111635 100644 --- a/sysdeps/sparc/sparc32/bits/atomic.h +++ b/sysdeps/sparc/sparc32/atomic-machine.h @@ -17,8 +17,8 @@ License along with the GNU C Library; if not, see . */ -#ifndef _BITS_ATOMIC_H -#define _BITS_ATOMIC_H 1 +#ifndef _ATOMIC_MACHINE_H +#define _ATOMIC_MACHINE_H 1 #include @@ -357,4 +357,4 @@ extern uint64_t _dl_hwcap __attribute__((weak)); #include -#endif /* bits/atomic.h */ +#endif /* atomic-machine.h */ diff --git a/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h b/sysdeps/sparc/sparc32/sparcv9/atomic-machine.h similarity index 100% rename from sysdeps/sparc/sparc32/sparcv9/bits/atomic.h rename to sysdeps/sparc/sparc32/sparcv9/atomic-machine.h diff --git a/sysdeps/sparc/sparc64/bits/atomic.h b/sysdeps/sparc/sparc64/atomic-machine.h similarity index 100% rename from sysdeps/sparc/sparc64/bits/atomic.h rename to sysdeps/sparc/sparc64/atomic-machine.h diff --git a/sysdeps/tile/bits/atomic.h b/sysdeps/tile/atomic-machine.h similarity index 100% rename from sysdeps/tile/bits/atomic.h rename to sysdeps/tile/atomic-machine.h diff --git a/sysdeps/tile/tilegx/bits/atomic.h b/sysdeps/tile/tilegx/atomic-machine.h similarity index 94% rename from sysdeps/tile/tilegx/bits/atomic.h rename to sysdeps/tile/tilegx/atomic-machine.h index e75efb1c41..1f7805bb88 100644 --- a/sysdeps/tile/tilegx/bits/atomic.h +++ b/sysdeps/tile/tilegx/atomic-machine.h @@ -16,8 +16,8 @@ License along with the GNU C Library. If not, see . */ -#ifndef _BITS_ATOMIC_H -#define _BITS_ATOMIC_H 1 +#ifndef _ATOMIC_MACHINE_H +#define _ATOMIC_MACHINE_H 1 #include @@ -55,6 +55,6 @@ #define atomic_decrement_if_positive(mem) \ __atomic_update (mem, -1, fetchaddgez) -#include +#include -#endif /* bits/atomic.h */ +#endif /* atomic-machine.h */ diff --git a/sysdeps/tile/tilepro/bits/atomic.h b/sysdeps/tile/tilepro/atomic-machine.h similarity index 96% rename from sysdeps/tile/tilepro/bits/atomic.h rename to sysdeps/tile/tilepro/atomic-machine.h index e0ef9fb5e7..a99f170394 100644 --- a/sysdeps/tile/tilepro/bits/atomic.h +++ b/sysdeps/tile/tilepro/atomic-machine.h @@ -16,8 +16,8 @@ License along with the GNU C Library. If not, see . */ -#ifndef _BITS_ATOMIC_H -#define _BITS_ATOMIC_H 1 +#ifndef _ATOMIC_MACHINE_H +#define _ATOMIC_MACHINE_H 1 #include @@ -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 +#include -#endif /* bits/atomic.h */ +#endif /* atomic-machine.h */ diff --git a/sysdeps/unix/sysv/linux/arm/bits/atomic.h b/sysdeps/unix/sysv/linux/arm/atomic-machine.h similarity index 99% rename from sysdeps/unix/sysv/linux/arm/bits/atomic.h rename to sysdeps/unix/sysv/linux/arm/atomic-machine.h index 17cff546ad..4f5f3f4514 100644 --- a/sysdeps/unix/sysv/linux/arm/bits/atomic.h +++ b/sysdeps/unix/sysv/linux/arm/atomic-machine.h @@ -104,4 +104,4 @@ (__typeof (oldval)) a_tmp; }) #endif -#include +#include diff --git a/sysdeps/unix/sysv/linux/hppa/bits/atomic.h b/sysdeps/unix/sysv/linux/hppa/atomic-machine.h similarity index 97% rename from sysdeps/unix/sysv/linux/hppa/bits/atomic.h rename to sysdeps/unix/sysv/linux/hppa/atomic-machine.h index 26b66c5134..8fbcb493a7 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/atomic.h +++ b/sysdeps/unix/sysv/linux/hppa/atomic-machine.h @@ -25,8 +25,8 @@ #define ENOSYS 251 #endif -#ifndef _BITS_ATOMIC_H -#define _BITS_ATOMIC_H 1 +#ifndef _ATOMIC_MACHINE_H +#define _ATOMIC_MACHINE_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_MACHINE_H */ diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h b/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h similarity index 98% rename from sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h rename to sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h index 16002f15db..ee6f8e254a 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/atomic-machine.h @@ -16,8 +16,8 @@ License along with the GNU C Library. If not, see . */ -#ifndef _BITS_ATOMIC_H -#define _BITS_ATOMIC_H 1 +#ifndef _ATOMIC_MACHINE_H +#define _ATOMIC_MACHINE_H 1 #include #include diff --git a/sysdeps/unix/sysv/linux/nios2/bits/atomic.h b/sysdeps/unix/sysv/linux/nios2/atomic-machine.h similarity index 96% rename from sysdeps/unix/sysv/linux/nios2/bits/atomic.h rename to sysdeps/unix/sysv/linux/nios2/atomic-machine.h index 2329f7463d..ee4e4e3b0a 100644 --- a/sysdeps/unix/sysv/linux/nios2/bits/atomic.h +++ b/sysdeps/unix/sysv/linux/nios2/atomic-machine.h @@ -16,8 +16,8 @@ License along with the GNU C Library. If not, see . */ -#ifndef _NIOS2_BITS_ATOMIC_H -#define _NIOS2_BITS_ATOMIC_H 1 +#ifndef _NIOS2_ATOMIC_MACHINE_H +#define _NIOS2_ATOMIC_MACHINE_H 1 #include @@ -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_MACHINE_H */ diff --git a/sysdeps/unix/sysv/linux/sh/bits/atomic.h b/sysdeps/unix/sysv/linux/sh/atomic-machine.h similarity index 100% rename from sysdeps/unix/sysv/linux/sh/bits/atomic.h rename to sysdeps/unix/sysv/linux/sh/atomic-machine.h diff --git a/sysdeps/x86_64/bits/atomic.h b/sysdeps/x86_64/atomic-machine.h similarity index 100% rename from sysdeps/x86_64/bits/atomic.h rename to sysdeps/x86_64/atomic-machine.h