diff mbox

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

Message ID 20140821175954.GA10983@spoyarek.pnq.redhat.com
State Superseded
Headers show

Commit Message

Siddhesh Poyarekar Aug. 21, 2014, 5:59 p.m. UTC
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.
---
 Makeconfig | 1 +
 1 file changed, 1 insertion(+)
diff mbox

Patch

diff --git a/Makeconfig b/Makeconfig
index df26cd0..38f4851 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) \
+	   -include $(common-objpfx)config.h \
 	   $(CPPFLAGS-$(suffix $@)) \
 	   $(foreach lib,$(libof-$(basename $(@F))) \
 			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \