From patchwork Thu Apr 9 21:44:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 459834 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 05BCC140082 for ; Fri, 10 Apr 2015 07:44:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=sourceware.org header.i=@sourceware.org header.b=piTjqltd; dkim-adsp=none (unprotected policy); dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=iVBmLugjHMGGu7tId+W0BfMqzFPNYVNS+mn9E71krFgYId 3lX03ACt9OfyWYlvm8dBCrJHq8FprGCQ2kz3604KYWBFfXGOpHJRZMwHCtpsN1xr aXMl20T89OEPgsiSHgz0b07pzXgbL3iEZ1slfTsEZ9xeoaavGFTJ3DuefLCRY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=wNBAHwqLYh/nbVZ9fChWkM94KOY=; b=piTjqltdfze9C4+kb8Qb Wp5XhOxcb3k9Vp1gPCJBFCf/cLY0nQPJTf7DeWPjH1xYAlIodiRzouPIxqCVe8Mc EC3ziWbGldDa0hwPdc0mSjJ1sZTphFdXlldCjosen8Tv7OkuOrG34W+JTsIgB+f8 xtup+FiOk/wDjxG6UWiKHGY= Received: (qmail 29145 invoked by alias); 9 Apr 2015 21:44:49 -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 29133 invoked by uid 89); 9 Apr 2015 21:44:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.7 required=5.0 tests=AWL, BAYES_40, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] Omit libc-modules.h for all .v.i files. Message-Id: <20150409214445.E08512C3B9E@topped-with-meat.com> Date: Thu, 9 Apr 2015 14:44:45 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=yhquWfXSyFjAH1HcdoYA:9 a=CjuIK1q_8ugA:10 The shlib-versions and Versions files are not really special. All files we run through cpp with the .v.i treatment are things where IS_IN makes no sense, and might well be things that need to be generated before libc-modules.h is available. Thanks, Roland * Makeconfig (module-cppflags): Exclude all .v.i files. (skip-module-cppflags): Variable removed. --- a/Makeconfig +++ b/Makeconfig @@ -848,12 +848,6 @@ built-modules = iconvprogs iconvdata ldconfig lddlibc4 libmemusage \ libSegFault libpcprofile librpcsvc locale-programs \ memusagestat nonlib nscd extramodules libnldbl -# We don't include libc-modules.h when these targets are being built. These -# targets don't (and will likely never need to) use the IS_IN facility. In -# fact, shlib-versions should not use it because that will create a circular -# dependency as libc-modules.h is generated from shlib-versions. -skip-module-cppflags = shlib-versions.v.i Versions.v.i - in-module = $(subst -,_,$(firstword $(libof-$(basename $(@F))) \ $(libof-$(