[PATCH v1.1 20/20] Include config.h in MIN-CPPFLAGS

[Siddhesh Poyarekar <siddhesh at redhat dot com>]

On Thu, Aug 21, 2014 at 11:29:54PM +0530, Siddhesh Poyarekar wrote:
> This is needed when processing the Versions files since they could
> refer to macros defined in config.h.  config.h was earlier included
> through libc-symbols.h but since MIN-CPPFLAGS does not include the
> latter anymore, it needs to at least include config.h.
> 
> This was causing a difference in generated code on s390x.  With this
> change, s390x code is also unchanged with this and other 19 patches
> (barring the IN_LIB patch of course).
> 
> 	* Makeconfig (MIN-CPPFLAGS): Include config.h.

config.h checks a few macros, most of which are set at command line,
with the exception of _LIBC, which is set in libc-symbols.h.  Set it
on the commandline to be consistent with the behaviour we ought to get
with libc-symbols.h included.

    
	* Makeconfig (MIN-CPPFLAGS): Include config.h.

diff --git a/Makeconfig b/Makeconfig
index df26cd0..c6eae06 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -845,6 +845,7 @@ override CXXFLAGS = $(c++-sysincludes) \
 MIN-CPPFLAGS = $(config-extra-cppflags) $(CPPUNDEFS) $(CPPFLAGS-config) \
 	   $($(subdir)-CPPFLAGS) \
 	   $(+includes) $(defines) $(sysdep-CPPFLAGS) \
+	   -D_LIBC -include $(common-objpfx)config.h \
 	   $(CPPFLAGS-$(suffix $@)) \
 	   $(foreach lib,$(libof-$(basename $(@F))) \
 			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \

Attachment: pgpFHVJWodDtf.pgp
Description: PGP signature