aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-09-04 15:25:42 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-09-04 15:25:42 +0000
commit3f2e46a4948c846023275eb7a8c86ede0313cd2f (patch)
tree963a5dfe20f51d8cb5b8e2a6435c8fee9bb878f0 /include
parent44558701ff93118de40d5d5484e210149570f951 (diff)
downloadglibc-3f2e46a4948c846023275eb7a8c86ede0313cd2f.tar
glibc-3f2e46a4948c846023275eb7a8c86ede0313cd2f.tar.gz
glibc-3f2e46a4948c846023275eb7a8c86ede0313cd2f.tar.bz2
glibc-3f2e46a4948c846023275eb7a8c86ede0313cd2f.zip
Remove --disable-versioning.
Diffstat (limited to 'include')
-rw-r--r--include/libc-symbols.h4
-rw-r--r--include/shlib-compat.h8
2 files changed, 4 insertions, 8 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index a3b6274bad..5f603a2864 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -322,7 +322,7 @@ for linking")
past the last element in SET. */
#define symbol_set_end_p(set, ptr) ((ptr) >= (void *const *) &__stop_##set)
-#if DO_VERSIONING
+#ifdef SHARED
# define symbol_version(real, name, version) \
_symbol_version(real, name, version)
# define default_symbol_version(real, name, version) \
@@ -466,7 +466,7 @@ for linking")
versioned_symbol (libc, __real_foo, foo, GLIBC_2_1);
libc_hidden_ver (__real_foo, foo) */
-#if defined SHARED && defined DO_VERSIONING && !defined NO_HIDDEN
+#if defined SHARED && !defined NO_HIDDEN
# ifndef __ASSEMBLER__
# define __hidden_proto_hiddenattr(attrs...) \
__attribute__ ((visibility ("hidden"), ##attrs))
diff --git a/include/shlib-compat.h b/include/shlib-compat.h
index 979b5929e3..955c6aeea2 100644
--- a/include/shlib-compat.h
+++ b/include/shlib-compat.h
@@ -19,13 +19,9 @@
#ifndef _SHLIB_COMPAT_H
#define _SHLIB_COMPAT_H 1
-#if defined DO_VERSIONING
-/* Since there is just one set of .d files generated, we need to
- include this unconditionally to have the dependency noticed properly. */
-#include <abi-versions.h> /* header generated by abi-versions.awk */
-#endif
+#ifdef SHARED
-#if defined SHARED && defined DO_VERSIONING
+# include <abi-versions.h>
/* The file abi-versions.h (generated by scripts/abi-versions.awk) defines
symbols like `ABI_libm_GLIBC_2_0' for each version set in the source