AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Install libm.a as linker script (bug 20539).

Browse Source 
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.
This commit is contained in:
Andrew Senkevich 2016-12-08 17:25:59 +03:00
parent 23b5cae1af
commit cbd8f9302c
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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> 2016-12-08 Martin Galvan <martin.galvan@tallertechnologies.com>
* INSTALL: Regenerated. * INSTALL: Regenerated.

1
Makerules
View File

@ -1237,6 +1237,7 @@ $(addprefix $(inst_sbindir)/,$(install-sbin)): \
endif endif
ifdef install-lib ifdef install-lib
install-lib.a := $(filter lib%.a,$(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)) install-lib-non.a := $(filter-out lib%.a,$(install-lib))
ifdef install-lib-non.a ifdef install-lib-non.a
$(addprefix $(inst_libdir)/$(libprefix),$(install-lib-non.a)): \ $(addprefix $(inst_libdir)/$(libprefix),$(install-lib-non.a)): \

19
math/Makefile
View File

@ -128,10 +128,10 @@ generated += $(foreach s,.c .S,$(call type-foreach, $(calls:s_%=m_%$(s))))
routines = $(call type-foreach, $(calls)) routines = $(call type-foreach, $(calls))
ifeq ($(build-mathvec),yes) ifeq ($(build-mathvec),yes)
# We need to install libm.so as linker script # We need to install libm.so and libm.a as linker scripts
# for more comfortable use of vector math library. # for transparent use of vector math library.
install-lib-ldscripts := libm.so install-lib-ldscripts := libm.so libm.a
install_subdir: $(inst_libdir)/libm.so install-others = $(inst_libdir)/libm.so $(inst_libdir)/libm.a
$(inst_libdir)/libm.so: $(common-objpfx)format.lds \ $(inst_libdir)/libm.so: $(common-objpfx)format.lds \
$(libm) \ $(libm) \
$(libmvec) \ $(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) ) )' \ 'AS_NEEDED ( $(libdir)/libmvec_nonshared.a $(slibdir)/libmvec.so$(libmvec.so-version) ) )' \
) > $@.new ) > $@.new
mv -f $@.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 endif
# Rules for the test suite. # Rules for the test suite.