From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 9 Apr 2015 21:42:29 +0000 (-0700)
Subject: Omit libc-modules.h for all .v.i files.
X-Git-Tag: glibc-2.22~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a257e2cb50cd8e8e3e2368d80bf325ea4086cf9;p=thirdparty%2Fglibc.git

Omit libc-modules.h for all .v.i files.
---

diff --git a/ChangeLog b/ChangeLog
index 193ea30083c..c2eacca8de7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-09  Roland McGrath  <roland@hack.frob.com>
 
+	* Makeconfig (module-cppflags): Exclude all .v.i files.
+	(skip-module-cppflags): Variable removed.
+
 	* configure.ac (libc_config_ok): Initialize before reading
 	preconfigure scripts, not after.
 	* configure: Regenerated.
diff --git a/Makeconfig b/Makeconfig
index 4e336a4ed85..dc7f2088ebc 100644
--- 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-$(<F)) \
 				    $(libof-$(@F)) \
@@ -862,10 +856,12 @@ in-module = $(subst -,_,$(firstword $(libof-$(basename $(@F))) \
 module-cppflags-real = -include $(common-objpfx)libc-modules.h \
 		       -DMODULE_NAME=$(in-module)
 
-# We don't need libc-modules.h and the MODULE_NAME definition for
-# shlib-version.v.i.
-module-cppflags = $(if $(filter $(@F),$(skip-module-cppflags)), \
-		       ,$(module-cppflags-real))
+# We don't need libc-modules.h and the MODULE_NAME definition for .v.i
+# files.  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.
+module-cppflags = $(if $(filter %.v.i,$(@F)),,$(module-cppflags-real))
 
 # These are the variables that the implicit compilation rules use.
 # Note that we can't use -std=* in CPPFLAGS, because it overrides