From patchwork Thu Oct 20 19:20:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Senkevich X-Patchwork-Id: 16699 Received: (qmail 73377 invoked by alias); 20 Oct 2016 19:21:36 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 73363 invoked by uid 89); 20 Oct 2016 19:21:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=1426, 142, 6, Hx-languages-length:2198, S X-HELO: mail-vk0-f66.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=hcurIARwgXZB3UxPvZnd5RHMvV0oBgvuMW5X1wAyp/w=; b=UYMWjXtX8HN1np4dDtkL+Bc95dNjHPIllwtodBQaefOnUU/uLNW06mL2d7qVXii2y4 i+rnaoNE/W9mKXj4WTxLa48aayoXvUXdt9Odna7lwBC4no8nBxHTucMpaqV3YHTVaZgN ITLhJrOKjUY/LSswH+oo+UGperhfaAIag24DiqRpOx9BGJ/iVsm4BJpiJnMG48G9EKL2 OPXqHvnWTfj8nhyTYic/df+EcHMT04WklPtrqK/Ms85P87NWDjUqU4pVVgiqRibJEVmo Mokymvz7xv/73Oy/x6MqwIyPn5Glajq5GpiVh89W2Jj+O2/Xu2GIjnBdtUZB1ivwdBQc c8rQ== X-Gm-Message-State: AA6/9RkkVc+bdBFtb69xOmTWl+5TnA2E7oZpSJ6xbmHqiXrbDFA+PwktK4FOFdZuCjlB85IEDxWTqPqMPGM1Fg== X-Received: by 10.31.80.132 with SMTP id e126mr3447137vkb.109.1476991283188; Thu, 20 Oct 2016 12:21:23 -0700 (PDT) MIME-Version: 1.0 From: Andrew Senkevich Date: Thu, 20 Oct 2016 22:20:52 +0300 Message-ID: Subject: [PATCH] Install libm.a as linker script [BZ #20539] To: libc-alpha 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 [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. $(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 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