This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Install libm.a as linker script [BZ #20539]


Hi,

to avoid static link fail w/o passing additional -lmvec option (while
building with GCC 6.1 and above) this patch makes libm.a installed as
linker script.
Tested on x86_64.  Ok for trunk?

2016-10-20  Andrew Senkevich  <andrew.senkevich@intel.com>

        [BZ #20539]
        * Makerules (install-lib.a): filter out libm.a in case of libmvec build.
        * math/Makefile: added rules for libm.a installation as linker script.

diff --git a/Makerules b/Makerules
index e865782..290f927 100644
--- a/Makerules
+++ b/Makerules
@@ -1190,7 +1190,9 @@ $(addprefix $(inst_sbindir)/,$(install-sbin)): \
        $(do-install-program)
 endif
 ifdef install-lib
-install-lib.a := $(filter lib%.a,$(install-lib))
+ifeq ($(build-mathvec),yes)
+install-lib.a := $(filter-out libm.a,$(filter lib%.a,$(install-lib)))
+endif
 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 2aa6a34..a96ef30 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -128,8 +128,8 @@ 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.
+# We need to install libm.so and libm.a as linker scripts
+# for transparent use of vector math library.
 install-lib-ldscripts := libm.so
 install_subdir: $(inst_libdir)/libm.so
 $(inst_libdir)/libm.so: $(common-objpfx)format.lds \
@@ -142,6 +142,19 @@ $(inst_libdir)/libm.so: $(common-objpfx)format.lds \
              'AS_NEEDED ( $(libdir)/libmvec_nonshared.a
$(slibdir)/libmvec.so$(libmvec.so-version) ) )' \
        ) > $@.new
        mv -f $@.new $@
+
+install-others = $(inst_libdir)/libm.a
+$(inst_libdir)/libm.a: $(common-objpfx)format.lds \
+                      $(libm) \
+                      $(libmvec) \
+                      $(+force)
+       (echo '/* GNU ld script'; echo '*/';\
+        cat $<; \
+        echo 'GROUP ( $(libdir)/libm-$(lib-version).a ' \
+             'AS_NEEDED ( $(libdir)/libmvec.a) )' \
+       ) > $@.new
+       cp $(objpfx)libm.a $(libdir)/libm-$(lib-version).a
+       mv -f $@.new $@
 endif

 # Rules for the test suite.


--
WBR,
Andrew


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]