diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 14:34:15 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 14:34:15 -0400 |
| commit | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch) | |
| tree | db47da854c7d3bfc2c3bce4c6fc8381075ac9ec4 /include | |
| parent | 1248c1c41508387ff282b208636737e8cdc9b5b0 (diff) | |
| download | glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz | |
Cleanup of configuration options
Make several tool features mandatory and simplify the code.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc-symbols.h | 33 | ||||
| -rw-r--r-- | include/tls.h | 2 |
2 files changed, 8 insertions, 27 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 67e1ca2083..851efc5c28 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -216,11 +216,6 @@ # define internal_function /* empty */ #endif -/* Prepare for the case that `__builtin_expect' is not available. */ -#ifndef HAVE_BUILTIN_EXPECT -# define __builtin_expect(expr, val) (expr) -#endif - /* Determine the return address. */ #define RETURN_ADDRESS(nr) \ __builtin_extract_return_addr (__builtin_return_address (nr)) @@ -460,11 +455,7 @@ for linking") # define attribute_hidden #endif -#ifdef HAVE_TLS_MODEL_ATTRIBUTE -# define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec"))) -#else -# define attribute_tls_model_ie -#endif +#define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec"))) #define attribute_relro __attribute__ ((section (".data.rel.ro"))) @@ -794,22 +785,12 @@ for linking") # define libnss_nisplus_hidden_data_ver(local, name) #endif -#ifdef HAVE_BUILTIN_REDIRECTION -# define libc_hidden_builtin_proto(name, attrs...) libc_hidden_proto (name, ##attrs) -# define libc_hidden_builtin_def(name) libc_hidden_def (name) -# define libc_hidden_builtin_weak(name) libc_hidden_weak (name) -# define libc_hidden_builtin_ver(local, name) libc_hidden_ver (local, name) -# ifdef __ASSEMBLER__ -# define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name) -# endif -#else -# define libc_hidden_builtin_proto(name, attrs...) -# define libc_hidden_builtin_def(name) -# define libc_hidden_builtin_weak(name) -# define libc_hidden_builtin_ver(local, name) -# ifdef __ASSEMBLER__ -# define HIDDEN_BUILTIN_JUMPTARGET(name) JUMPTARGET(name) -# endif +#define libc_hidden_builtin_proto(name, attrs...) libc_hidden_proto (name, ##attrs) +#define libc_hidden_builtin_def(name) libc_hidden_def (name) +#define libc_hidden_builtin_weak(name) libc_hidden_weak (name) +#define libc_hidden_builtin_ver(local, name) libc_hidden_ver (local, name) +#ifdef __ASSEMBLER__ +# define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name) #endif #if defined NOT_IN_libc && defined IS_IN_libutil diff --git a/include/tls.h b/include/tls.h index 1642456a73..8ee2b947be 100644 --- a/include/tls.h +++ b/include/tls.h @@ -5,7 +5,7 @@ #include_next <tls.h> -#if HAVE___THREAD && (!defined NOT_IN_libc || defined IS_IN_libpthread) +#if !defined NOT_IN_libc || defined IS_IN_libpthread # define USE___THREAD 1 |