From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-ports-return-3898-listarch-libc-ports=sources.redhat.com@sourceware.org>
Received: (qmail 27340 invoked by alias); 12 Mar 2013 09:18:59 -0000
Received: (qmail 27325 invoked by uid 22791); 12 Mar 2013 09:18:58 -0000
X-SWARE-Spam-Status: No, hits=-6.2 required=5.0	tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 12 Mar 2013 09:18:45 +0000
Received: from relay1.suse.de (unknown [195.135.220.254])	by mx2.suse.de (Postfix) with ESMTP id A8959A41E0;	Tue, 12 Mar 2013 10:18:42 +0100 (CET)
From: Andreas Schwab <schwab@suse.de>
To: Chris Metcalf <cmetcalf@tilera.com>
Cc: Roland McGrath <roland@hack.frob.com>,	<libc-alpha@sourceware.org>, <libc-ports@sourceware.org>
Subject: [PATCH] Don't build .os objects of static-only-routines for extra libs
References: <mvmr4juw5y8.fsf@hawking.suse.de>	<20130308215906.6B7A22C0A5@topped-with-meat.com>	<mvmr4jmqnft.fsf@hawking.suse.de> <513DD75F.6020405@tilera.com>	<mvmboaqqcrk.fsf@hawking.suse.de> <513DE784.2020504@tilera.com>	<mvm7gleq9x7.fsf@hawking.suse.de>
X-Yow: -- In 1962, you could buy a pair of SHARKSKIN SLACKS, with a ``Continental Belt,'' for $10.99!!
Date: Tue, 12 Mar 2013 09:18:00 -0000
In-Reply-To: <mvm7gleq9x7.fsf@hawking.suse.de> (Andreas Schwab's message of	"Mon, 11 Mar 2013 15:37:56 +0100")
Message-ID: <mvmtxohnfgu.fsf_-_@hawking.suse.de>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-ports.sourceware.org>
List-Subscribe: <mailto:libc-ports-subscribe@sourceware.org>
List-Post: <mailto:libc-ports@sourceware.org>
List-Help: <mailto:libc-ports-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: libc-ports-owner@sourceware.org
X-SW-Source: 2013-03/txt/msg00110.txt.bz2

	* extra-lib.mk (extra-objs): Add static-only-routines as .oS
	instead of .os.
---
 extra-lib.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extra-lib.mk b/extra-lib.mk
index a2293c5..247946f 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -34,7 +34,12 @@ extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\
 					   $($(lib)-shared-only-routines),\
 					   $(all-$(lib)-routines))))
 ifneq (,$(filter .os,$(object-suffixes-$(lib))))
-extra-objs += $(all-$(lib)-routines:%=%.os)
+extra-objs += $(patsubst %,%.os,$(filter-out $($(lib)-static-only-routines),\
+					     $(all-$(lib)-routines)))
+endif
+ifneq (,$(filter .oS,$(object-suffixes-$(lib))))
+extra-objs += $(patsubst %,%.oS,$(filter $($(lib)-static-only-routines),\
+					 $(all-$(lib)-routines)))
 endif
 alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
 			     $(objpfx)$(patsubst %,$(libtype$o),\
-- 
1.8.1.5


-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."