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 f400d7b..39a34b9 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,18 @@ $(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 ( $(inst_libdir)/libm-$(lib-version).a $(inst_libdir)/libmvec.a )' \ + ) > $@.new + cp $(objpfx)libm.a $(inst_libdir)/libm-$(lib-version).a + mv -f $@.new $@ endif # Rules for the test suite.