diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/gnu/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/strstr-c.c | 2 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h | 2 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/dl-machine.c | 7 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/sysdep.h | 3 | ||||
| -rw-r--r-- | sysdeps/wordsize-32/divdi3.c | 2 |
6 files changed, 5 insertions, 13 deletions
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile index 6695cbf0cf..b3166967cc 100644 --- a/sysdeps/gnu/Makefile +++ b/sysdeps/gnu/Makefile @@ -29,7 +29,7 @@ ifeq ($(subdir),stdio-common) errlist-c = $(firstword $(wildcard $(addsuffix /errlist.c,$(sysdirs) .))) -ifeq ($(versioning),yes) +ifeq ($(build-shared),yes) $(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \ $(common-objpfx)Versions.v.i $(before-compile) else diff --git a/sysdeps/i386/i686/multiarch/strstr-c.c b/sysdeps/i386/i686/multiarch/strstr-c.c index 7516c7ffee..7b8794e9f0 100644 --- a/sysdeps/i386/i686/multiarch/strstr-c.c +++ b/sysdeps/i386/i686/multiarch/strstr-c.c @@ -4,7 +4,7 @@ #include "init-arch.h" #define STRSTR __strstr_ia32 -#if defined SHARED && defined DO_VERSIONING && !defined NO_HIDDEN +#if defined SHARED && !defined NO_HIDDEN #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) \ __hidden_ver1 (__strstr_ia32, __GI_strstr, __strstr_ia32); diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h index b0b863cba5..af861c11ea 100644 --- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h +++ b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h @@ -10,7 +10,7 @@ SHLIB_COMPAT(lib, introduced, LONG_DOUBLE_COMPAT_VERSION) #define long_double_symbol(lib, local, symbol) \ long_double_symbol_1 (lib, local, symbol, LONG_DOUBLE_COMPAT_VERSION) -#if defined SHARED && defined DO_VERSIONING +#ifdef SHARED # define ldbl_hidden_def(local, name) libc_hidden_ver (local, name) # define ldbl_strong_alias(name, aliasname) \ strong_alias (name, __GL_##name##_##aliasname) \ diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c index 188f72cdb7..3e7202d869 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.c +++ b/sysdeps/powerpc/powerpc32/dl-machine.c @@ -29,13 +29,6 @@ by _dl_sysdep_start via DL_PLATFORM_INIT. */ extern int __cache_line_size attribute_hidden; -/* Because ld.so is now versioned, these functions can be in their own file; - no relocations need to be done to call them. - Of course, if ld.so is not versioned... */ -#if defined SHARED && !(DO_VERSIONING - 0) -#error This will not work with versioning turned off, sorry. -#endif - /* Stuff for the PLT. */ #define PLT_INITIAL_ENTRY_WORDS 18 diff --git a/sysdeps/powerpc/powerpc32/sysdep.h b/sysdeps/powerpc/powerpc32/sysdep.h index 47d02a8048..78f54f91c4 100644 --- a/sysdeps/powerpc/powerpc32/sysdep.h +++ b/sysdeps/powerpc/powerpc32/sysdep.h @@ -99,8 +99,7 @@ GOT_LABEL: ; \ # define JUMPTARGET(name) name #endif -#if defined SHARED && defined DO_VERSIONING && defined PIC \ - && !defined NO_HIDDEN +#if defined SHARED && defined PIC && !defined NO_HIDDEN # undef HIDDEN_JUMPTARGET # define HIDDEN_JUMPTARGET(name) __GI_##name##@local #endif diff --git a/sysdeps/wordsize-32/divdi3.c b/sysdeps/wordsize-32/divdi3.c index 7898541eb0..fa122aa5fd 100644 --- a/sysdeps/wordsize-32/divdi3.c +++ b/sysdeps/wordsize-32/divdi3.c @@ -333,7 +333,7 @@ strong_alias (__umoddi3, __umoddi3_internal) /* We declare these with compat_symbol so that they are not visible at link time. Programs must use the functions from libgcc. */ -#if defined SHARED && defined DO_VERSIONING +#ifdef SHARED # include <shlib-compat.h> compat_symbol (libc, __divdi3, __divdi3, GLIBC_2_0); compat_symbol (libc, __moddi3, __moddi3, GLIBC_2_0); |