diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-09-13 02:28:34 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-09-13 02:28:34 +0000 |
| commit | 07a485defae1ef578c5b3ce0d4373201948a7345 (patch) | |
| tree | 2184f0f32083bd47ef3b82ad016d8d710f8f221f /libpthread/linuxthreads/sysdeps/i386/pt-machine.h | |
| parent | 224ca9f63688cdecd80ed01c25f5f62871fe4cfc (diff) | |
| download | uClibc-alpine-07a485defae1ef578c5b3ce0d4373201948a7345.tar.bz2 uClibc-alpine-07a485defae1ef578c5b3ce0d4373201948a7345.tar.xz | |
Merge with trunk. "So do that funky merge whiiite boy..."
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/i386/pt-machine.h')
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/i386/pt-machine.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpthread/linuxthreads/sysdeps/i386/pt-machine.h b/libpthread/linuxthreads/sysdeps/i386/pt-machine.h index e8a9b4e67..af1818d7b 100644 --- a/libpthread/linuxthreads/sysdeps/i386/pt-machine.h +++ b/libpthread/linuxthreads/sysdeps/i386/pt-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent pthreads configuration and inline functions. i386 version. - Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson <rth@tamu.edu>. @@ -24,7 +24,7 @@ #ifndef __ASSEMBLER__ #ifndef PT_EI -# define PT_EI extern inline +# define PT_EI extern inline __attribute__ ((always_inline)) #endif extern long int testandset (int *spinlock); @@ -36,7 +36,9 @@ extern int __compare_and_swap (long int *p, long int oldval, long int newval); /* See if we can optimize for newer cpus... */ -#if defined __GNUC__ && __GNUC__ >= 2 && defined __i486__ || defined __pentium__ || defined __pentiumpro__ +#if defined __GNUC__ && __GNUC__ >= 2 && \ + (defined __i486__ || defined __pentium__ || defined __pentiumpro__ || defined __pentium4__ || \ + defined __athlon__ || defined __k8__) /* Spinlock implementation; required. */ PT_EI long int |