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.

diff --git a/ChangeLog b/ChangeLog
index d5ef99c..dbf9376 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-12-08  Andrew Senkevich  <andrew.senkevich@intel.com>
+
+       [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.
+
 2016-12-08  Martin Galvan  <martin.galvan@tallertechnologies.com>
 
        * INSTALL: Regenerated.

diff --git a/Makerules b/Makerules
index 7214b2b..61a0240 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1237,6 +1237,7 @@ $(addprefix $(inst_sbindir)/,$(install-sbin)): \
 endif
 ifdef install-lib
 install-lib.a := $(filter lib%.a,$(install-lib))
+install-lib.a := $(filter-out $(install-lib-ldscripts),$(install-lib.a))
 install-lib-non.a := $(filter-out lib%.a,$(install-lib))
 ifdef install-lib-non.a
 $(addprefix $(inst_libdir)/$(libprefix),$(install-lib-non.a)): \

diff --git a/math/Makefile b/math/Makefile
index 848b093..49556f6 100644 (file)
--- 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.