diff options
author | Andreas Schwab <schwab@redhat.com> | 2009-10-12 13:48:49 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2009-10-12 13:48:49 +0200 |
commit | 65179518b1cb8a755366e88884eec4b1a518b978 (patch) | |
tree | b7481b2e654b61ee21f53fa278334af9071f5be8 /sysdeps | |
parent | 0c9cd95902e46a4a9e7684aea494a969787f48ac (diff) | |
parent | 1abedcdad2eef3d262c115ac13f069900338727c (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/mach/hurd/mkdirat.c | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/bits/fcntl.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/bits/fcntl.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/fcntl.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sh/bits/fcntl.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/fcntl.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h | 6 | ||||
-rw-r--r-- | sysdeps/x86_64/multiarch/init-arch.c | 1 | ||||
-rw-r--r-- | sysdeps/x86_64/multiarch/init-arch.h | 32 | ||||
-rw-r--r-- | sysdeps/x86_64/multiarch/strcasestr-c.c | 3 | ||||
-rw-r--r-- | sysdeps/x86_64/multiarch/strstr-c.c | 6 |
12 files changed, 44 insertions, 43 deletions
diff --git a/sysdeps/mach/hurd/mkdirat.c b/sysdeps/mach/hurd/mkdirat.c index 321d59f2fd..a300745690 100644 --- a/sysdeps/mach/hurd/mkdirat.c +++ b/sysdeps/mach/hurd/mkdirat.c @@ -22,6 +22,7 @@ #include <stddef.h> #include <sys/stat.h> #include <hurd.h> +#include <hurd/fd.h> int mkdirat (fd, path, mode) @@ -31,7 +32,7 @@ mkdirat (fd, path, mode) { error_t err; const char *name; - file_t parent = __directory_name_split (path, (char **) &name); + file_t parent = __directory_name_split_at (fd, path, (char **) &name); if (parent == MACH_PORT_NULL) return -1; err = __dir_mkdir (parent, name, mode & ~_hurd_umask); diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h index 35ef665998..0138b69d78 100644 --- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h @@ -85,13 +85,15 @@ #define F_SETLKW64 14 /* Set record locking info (blocking). */ #if defined __USE_BSD || defined __USE_UNIX98 -# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ +# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ +# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ #endif #ifdef __USE_GNU # define F_SETSIG 10 /* Set number of signal to be sent. */ # define F_GETSIG 11 /* Get number of signal to be sent. */ +# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ #endif #ifdef __USE_GNU diff --git a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h index 6abc5ced65..b0af8697f8 100644 --- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h @@ -81,13 +81,15 @@ #define F_SETLKW64 7 /* Set record locking info (blocking). */ #if defined __USE_BSD || defined __USE_UNIX98 -# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ +# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ +# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ #endif #ifdef __USE_GNU # define F_SETSIG 10 /* Set number of signal to be sent. */ # define F_GETSIG 11 /* Get number of signal to be sent. */ +# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ #endif #ifdef __USE_GNU diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h index 90b669ab60..f7ce2aacc8 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h @@ -85,13 +85,15 @@ #define F_SETLKW64 14 /* Set record locking info (blocking). */ #if defined __USE_BSD || defined __USE_UNIX98 -# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ +# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ +# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ #endif #ifdef __USE_GNU # define F_SETSIG 10 /* Set number of signal to be sent. */ # define F_GETSIG 11 /* Get number of signal to be sent. */ +# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ #endif #ifdef __USE_GNU diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h index ff5941df65..0e6cbfda85 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h @@ -100,13 +100,15 @@ #endif #if defined __USE_BSD || defined __USE_UNIX98 -# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ +# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ +# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ #endif #ifdef __USE_GNU # define F_SETSIG 10 /* Set number of signal to be sent. */ # define F_GETSIG 11 /* Get number of signal to be sent. */ +# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ #endif #ifdef __USE_GNU diff --git a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h index 35ef665998..dee02a101e 100644 --- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h @@ -85,13 +85,15 @@ #define F_SETLKW64 14 /* Set record locking info (blocking). */ #if defined __USE_BSD || defined __USE_UNIX98 -# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ +# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ +# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ #endif #ifdef __USE_GNU # define F_SETSIG 10 /* Set number of signal to be sent. */ # define F_GETSIG 11 /* Get number of signal to be sent. */ +# define F_SETOWN_EX 12 /* Get owner (thread receiving of SIGIO). */ +# define F_GETOWN_EX 13 /* Set owner (thread receiving of SIGIO). */ #endif #ifdef __USE_GNU diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h index d59744a55e..6d5e82676d 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h @@ -83,8 +83,8 @@ #define F_GETFL 3 /* Get file status flags. */ #define F_SETFL 4 /* Set file status flags. */ #if defined __USE_BSD || defined __USE_UNIX98 -# define F_GETOWN 5 /* Get owner of socket (receiver of SIGIO). */ -# define F_SETOWN 6 /* Set owner of socket (receiver of SIGIO). */ +# define F_GETOWN 5 /* Get owner (process receiving SIGIO). */ +# define F_SETOWN 6 /* Set owner (process receiving SIGIO). */ #endif #ifndef __USE_FILE_OFFSET64 # define F_GETLK 7 /* Get record locking info. */ @@ -99,6 +99,8 @@ #ifdef __USE_GNU # define F_SETSIG 10 /* Set number of signal to be sent. */ # define F_GETSIG 11 /* Get number of signal to be sent. */ +# define F_GETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +# define F_SETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ #endif #ifdef __USE_GNU diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h index bc0f4d687b..2041f5764e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h @@ -99,13 +99,15 @@ #endif #if defined __USE_BSD || defined __USE_UNIX98 -# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ +# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ +# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ #endif #ifdef __USE_GNU # define F_SETSIG 10 /* Set number of signal to be sent. */ # define F_GETSIG 11 /* Get number of signal to be sent. */ +# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ #endif #ifdef __USE_GNU diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c index 9a1e776c9a..7823aceb9b 100644 --- a/sysdeps/x86_64/multiarch/init-arch.c +++ b/sysdeps/x86_64/multiarch/init-arch.c @@ -77,6 +77,7 @@ __init_cpu_features (void) __cpu_features.kind = arch_kind_other; } +#undef __get_cpu_features const struct cpu_features * __get_cpu_features (void) diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h index 8d9b1e8d8c..9b12831a6e 100644 --- a/sysdeps/x86_64/multiarch/init-arch.h +++ b/sysdeps/x86_64/multiarch/init-arch.h @@ -58,30 +58,16 @@ extern void __init_cpu_features (void) attribute_hidden; extern const struct cpu_features *__get_cpu_features (void) __attribute__ ((const)); -/* Following are the feature tests used throughout libc. */ - #ifndef NOT_IN_libc -# define HAS_SSE2 \ - ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].edx & (1 << 26)) != 0) - -# define HAS_POPCOUNT \ - ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 23)) != 0) - -# define HAS_SSE4_2 \ - ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 20)) != 0) - -# define HAS_FMA \ - ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 12)) != 0) -#else -# define HAS_SSE2 \ - ((__get_cpu_features ()->cpuid[COMMON_CPUID_INDEX_1].edx & (1 << 26)) != 0) +# define __get_cpu_features() (&__cpu_features) +#endif -# define HAS_POPCOUNT \ - ((__get_cpu_features ()->cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 23)) != 0) +#define HAS_CPU_FEATURE(idx, reg, bit) \ + ((__get_cpu_features ()->cpuid[idx].reg & (1 << (bit))) != 0) -# define HAS_SSE4_2 \ - ((__get_cpu_features ()->cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 20)) != 0) +/* Following are the feature tests used throughout libc. */ -# define HAS_FMA \ - ((__get_cpu_features ()->cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 12)) != 0) -#endif +#define HAS_SSE2 HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, edx, 26) +#define HAS_POPCOUNT HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, 23) +#define HAS_SSE4_2 HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, 20) +#define HAS_FMA HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, 12) diff --git a/sysdeps/x86_64/multiarch/strcasestr-c.c b/sysdeps/x86_64/multiarch/strcasestr-c.c index 3cb5557b67..551492d8f5 100644 --- a/sysdeps/x86_64/multiarch/strcasestr-c.c +++ b/sysdeps/x86_64/multiarch/strcasestr-c.c @@ -1,9 +1,6 @@ #include "init-arch.h" #define STRCASESTR __strcasestr_sse2 -#undef libc_hidden_builtin_def -#define libc_hidden_builtin_def(name) \ - __hidden_ver1 (__strcasestr_sse2, __GI_strcasestr, __strcasestr_sse2); #include "string/strcasestr.c" diff --git a/sysdeps/x86_64/multiarch/strstr-c.c b/sysdeps/x86_64/multiarch/strstr-c.c index d593089a87..b8ed3161d5 100644 --- a/sysdeps/x86_64/multiarch/strstr-c.c +++ b/sysdeps/x86_64/multiarch/strstr-c.c @@ -1,9 +1,11 @@ #include "init-arch.h" #define STRSTR __strstr_sse2 -#undef libc_hidden_builtin_def -#define libc_hidden_builtin_def(name) \ +#ifdef SHARED +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(name) \ __hidden_ver1 (__strstr_sse2, __GI_strstr, __strstr_sse2); +#endif #include "string/strstr.c" |