From 94fa1bb40fb531a71f7f751afcf96c4ad2f99591 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 6 Jan 2008 00:04:02 +0000 Subject: use the __extern_always_inline define from cdefs.h instead of duplicating gcc version checking in every pt-machine.h header ... while __extern_always_inline should work fine, i think what is intended is __extern_inline ... should double check later --- libpthread/linuxthreads/sysdeps/alpha/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/arm/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/avr32/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/cris/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/hppa/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h | 2 +- libpthread/linuxthreads/sysdeps/i386/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/ia64/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/m68k/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/mips/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/powerpc/powerpc32/pt-machine.h | 2 +- libpthread/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h | 2 +- libpthread/linuxthreads/sysdeps/s390/s390-32/pt-machine.h | 2 +- libpthread/linuxthreads/sysdeps/s390/s390-64/pt-machine.h | 2 +- libpthread/linuxthreads/sysdeps/sh/pt-machine.h | 6 +----- libpthread/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h | 2 +- libpthread/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h | 2 +- libpthread/linuxthreads/sysdeps/x86_64/pt-machine.h | 6 +----- 18 files changed, 18 insertions(+), 62 deletions(-) (limited to 'libpthread/linuxthreads/sysdeps') diff --git a/libpthread/linuxthreads/sysdeps/alpha/pt-machine.h b/libpthread/linuxthreads/sysdeps/alpha/pt-machine.h index 26805c4e2..97c38394b 100644 --- a/libpthread/linuxthreads/sysdeps/alpha/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/alpha/pt-machine.h @@ -26,11 +26,7 @@ #include #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif #ifdef __linux__ diff --git a/libpthread/linuxthreads/sysdeps/arm/pt-machine.h b/libpthread/linuxthreads/sysdeps/arm/pt-machine.h index 80d040f4c..9ffc8bdc4 100644 --- a/libpthread/linuxthreads/sysdeps/arm/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/arm/pt-machine.h @@ -25,11 +25,7 @@ #include #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif /* This will not work on ARM1 or ARM2 because SWP is lacking on those diff --git a/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h index 253bda528..903a7ed54 100644 --- a/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h @@ -12,11 +12,7 @@ #include #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif static inline int diff --git a/libpthread/linuxthreads/sysdeps/cris/pt-machine.h b/libpthread/linuxthreads/sysdeps/cris/pt-machine.h index d6e46f376..33cf57908 100644 --- a/libpthread/linuxthreads/sysdeps/cris/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/cris/pt-machine.h @@ -24,11 +24,7 @@ #include #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif PT_EI long int diff --git a/libpthread/linuxthreads/sysdeps/hppa/pt-machine.h b/libpthread/linuxthreads/sysdeps/hppa/pt-machine.h index e50a42e31..780af7b96 100644 --- a/libpthread/linuxthreads/sysdeps/hppa/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/hppa/pt-machine.h @@ -26,11 +26,7 @@ #include #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif /* Get some notion of the current stack. Need not be exactly the top diff --git a/libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h b/libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h index 1c75bf980..222d44a3f 100644 --- a/libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h @@ -23,7 +23,7 @@ #define _PT_MACHINE_H 1 #ifndef PT_EI -# define PT_EI extern inline __attribute__ ((always_inline)) +# define PT_EI __extern_always_inline #endif #include "kernel-features.h" diff --git a/libpthread/linuxthreads/sysdeps/i386/pt-machine.h b/libpthread/linuxthreads/sysdeps/i386/pt-machine.h index ad004e90d..f96452599 100644 --- a/libpthread/linuxthreads/sysdeps/i386/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/i386/pt-machine.h @@ -29,11 +29,7 @@ #ifndef __ASSEMBLER__ #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif /* diff --git a/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h b/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h index 2fc94ec46..e36468a74 100644 --- a/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/ia64/pt-machine.h @@ -25,11 +25,7 @@ #include #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif /* Make sure gcc doesn't try to be clever and move things around on diff --git a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h b/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h index 3d1e87db1..a13c06946 100644 --- a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h @@ -25,11 +25,7 @@ #include #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif /* Spinlock implementation; required. */ diff --git a/libpthread/linuxthreads/sysdeps/mips/pt-machine.h b/libpthread/linuxthreads/sysdeps/mips/pt-machine.h index ce7028631..0ab7ac13f 100644 --- a/libpthread/linuxthreads/sysdeps/mips/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/mips/pt-machine.h @@ -29,11 +29,7 @@ #include #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif /* Spinlock implementation; required. */ diff --git a/libpthread/linuxthreads/sysdeps/powerpc/powerpc32/pt-machine.h b/libpthread/linuxthreads/sysdeps/powerpc/powerpc32/pt-machine.h index 8363d16d0..bfb13df67 100644 --- a/libpthread/linuxthreads/sysdeps/powerpc/powerpc32/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/powerpc/powerpc32/pt-machine.h @@ -26,7 +26,7 @@ #define _PT_MACHINE_H 1 #ifndef PT_EI -# define PT_EI extern inline __attribute__ ((always_inline)) +# define PT_EI __extern_always_inline #endif extern long int testandset (int *spinlock); diff --git a/libpthread/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h b/libpthread/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h index 562e69fa1..d7ed84108 100644 --- a/libpthread/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/powerpc/powerpc64/pt-machine.h @@ -25,7 +25,7 @@ #define _PT_MACHINE_H 1 #ifndef PT_EI -# define PT_EI extern inline __attribute__ ((always_inline)) +# define PT_EI __extern_always_inline #endif extern long int testandset (int *spinlock); diff --git a/libpthread/linuxthreads/sysdeps/s390/s390-32/pt-machine.h b/libpthread/linuxthreads/sysdeps/s390/s390-32/pt-machine.h index 398332965..d52d600ad 100644 --- a/libpthread/linuxthreads/sysdeps/s390/s390-32/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/s390/s390-32/pt-machine.h @@ -23,7 +23,7 @@ #define _PT_MACHINE_H 1 #ifndef PT_EI -# define PT_EI extern inline __attribute__ ((always_inline)) +# define PT_EI __extern_always_inline #endif extern long int testandset (int *spinlock); diff --git a/libpthread/linuxthreads/sysdeps/s390/s390-64/pt-machine.h b/libpthread/linuxthreads/sysdeps/s390/s390-64/pt-machine.h index 49f8ae2b9..187e1f872 100644 --- a/libpthread/linuxthreads/sysdeps/s390/s390-64/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/s390/s390-64/pt-machine.h @@ -23,7 +23,7 @@ #define _PT_MACHINE_H 1 #ifndef PT_EI -# define PT_EI extern inline __attribute__ ((always_inline)) +# define PT_EI __extern_always_inline #endif extern long int testandset (int *spinlock); diff --git a/libpthread/linuxthreads/sysdeps/sh/pt-machine.h b/libpthread/linuxthreads/sysdeps/sh/pt-machine.h index d1e560d33..4ec87ad89 100644 --- a/libpthread/linuxthreads/sysdeps/sh/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/sh/pt-machine.h @@ -26,11 +26,7 @@ #ifndef __ASSEMBLER__ #ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline #endif /* Spinlock implementation; required. */ diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h b/libpthread/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h index 322a52051..43c05f2a6 100644 --- a/libpthread/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h @@ -23,7 +23,7 @@ #define _PT_MACHINE_H 1 #ifndef PT_EI -# define PT_EI extern inline __attribute__ ((always_inline)) +# define PT_EI __extern_always_inline #endif extern long int testandset (int *spinlock); diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h b/libpthread/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h index f65c13be1..815d70e8d 100644 --- a/libpthread/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h @@ -23,7 +23,7 @@ #define _PT_MACHINE_H 1 #ifndef PT_EI -# define PT_EI extern inline __attribute__ ((always_inline)) +# define PT_EI __extern_always_inline #endif extern long int testandset (int *spinlock); diff --git a/libpthread/linuxthreads/sysdeps/x86_64/pt-machine.h b/libpthread/linuxthreads/sysdeps/x86_64/pt-machine.h index 66f9652fa..23615dbd8 100644 --- a/libpthread/linuxthreads/sysdeps/x86_64/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/x86_64/pt-machine.h @@ -30,11 +30,7 @@ # ifndef PT_EI -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define PT_EI static inline __attribute__((always_inline)) -# else -# define PT_EI extern inline __attribute__((always_inline)) -# endif +# define PT_EI __extern_always_inline # endif /* Get some notion of the current stack. Need not be exactly the top -- cgit v1.2.3