summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorAndrew Senkevich <andrew.senkevich@intel.com>2016-12-08 17:25:59 +0300
committerAndrew Senkevich <andrew.senkevich@intel.com>2016-12-08 17:25:59 +0300
commitcbd8f9302c9a04bf4fe72a3a1a641faf07614552 (patch)
treec41fe53f2e9d34b376bfe46ca201d4e3d7955f0c /math
parent23b5cae1af04f2d912910fdaf73cb482265798c1 (diff)
downloadglibc-cbd8f9302c9a04bf4fe72a3a1a641faf07614552.tar.gz
Install libm.a as linker script (bug 20539).
Install libm.a as linker script to avoid static link fail w/o passing additional -lmvec option while building with GCC >= 6.1. [BZ #20539] * math/Makefile (install-lib-ldscripts): Add libm.a. (install_subdir): Remove. (install-others): Add. ($(inst_libdir)/libm.a): Add rule for installation as linker script. * Makerules (install-lib.a): Filter out install-lib-ldscripts.
Diffstat (limited to 'math')
-rw-r--r--math/Makefile19
1 files changed, 15 insertions, 4 deletions
diff --git a/math/Makefile b/math/Makefile
index 848b093863..49556f69c6 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -128,10 +128,10 @@ generated += $(foreach s,.c .S,$(call type-foreach, $(calls:s_%=m_%$(s))))
routines = $(call type-foreach, $(calls))
ifeq ($(build-mathvec),yes)
-# We need to install libm.so as linker script
-# for more comfortable use of vector math library.
-install-lib-ldscripts := libm.so
-install_subdir: $(inst_libdir)/libm.so
+# We need to install libm.so and libm.a as linker scripts
+# for transparent use of vector math library.
+install-lib-ldscripts := libm.so libm.a
+install-others = $(inst_libdir)/libm.so $(inst_libdir)/libm.a
$(inst_libdir)/libm.so: $(common-objpfx)format.lds \
$(libm) \
$(libmvec) \
@@ -142,6 +142,17 @@ $(inst_libdir)/libm.so: $(common-objpfx)format.lds \
'AS_NEEDED ( $(libdir)/libmvec_nonshared.a $(slibdir)/libmvec.so$(libmvec.so-version) ) )' \
) > $@.new
mv -f $@.new $@
+
+$(inst_libdir)/libm.a: $(common-objpfx)format.lds \
+ $(libm) \
+ $(libmvec) \
+ $(+force)
+ (echo '/* GNU ld script'; echo '*/';\
+ cat $<; \
+ echo 'GROUP ( $(libdir)/libm-$(lib-version).a $(libdir)/libmvec.a )' \
+ ) > $@.new
+ cp $(objpfx)libm.a $(inst_libdir)/libm-$(lib-version).a
+ mv -f $@.new $@
endif
# Rules for the test suite.