aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2013-01-03 15:02:33 -0800
committerH.J. Lu <hjl.tools@gmail.com>2013-01-03 15:02:33 -0800
commit9b5a06c242e640d4af84a031e96ca47bcf595caf (patch)
tree0304299bad3c57a945fb33f077c31e32f37a8bc1 /sysdeps/i386
parent5d7dd1ca8436db8a1444310d3305ca141dc925ac (diff)
downloadglibc-hjl/pr14955.zip
glibc-hjl/pr14955.tar.gz
glibc-hjl/pr14955.tar.bz2
Make __get_cpu_features hiddenhjl/pr14955
Add static-init-arch.oS to libc_nonshared.a so that __get_cpu_features can be used in other shared libraries.
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/i686/multiarch/Makefile2
-rw-r--r--sysdeps/i386/i686/multiarch/Versions5
-rw-r--r--sysdeps/i386/i686/multiarch/static-init-arch.c1
3 files changed, 3 insertions, 5 deletions
diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile
index 8946bfa..e3c9724 100644
--- a/sysdeps/i386/i686/multiarch/Makefile
+++ b/sysdeps/i386/i686/multiarch/Makefile
@@ -1,5 +1,7 @@
ifeq ($(subdir),csu)
aux += init-arch
+sysdep_routines += static-init-arch
+static-only-routines += static-init-arch
tests += test-multiarch
gen-as-const-headers += ifunc-defines.sym
endif
diff --git a/sysdeps/i386/i686/multiarch/Versions b/sysdeps/i386/i686/multiarch/Versions
deleted file mode 100644
index 59b185a..0000000
--- a/sysdeps/i386/i686/multiarch/Versions
+++ /dev/null
@@ -1,5 +0,0 @@
-libc {
- GLIBC_PRIVATE {
- __get_cpu_features;
- }
-}
diff --git a/sysdeps/i386/i686/multiarch/static-init-arch.c b/sysdeps/i386/i686/multiarch/static-init-arch.c
new file mode 100644
index 0000000..6d8100d
--- /dev/null
+++ b/sysdeps/i386/i686/multiarch/static-init-arch.c
@@ -0,0 +1 @@
+#include <sysdeps/x86_64/multiarch/static-init-arch.c>