From patchwork Fri Aug 22 05:31:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 2512 Received: (qmail 17744 invoked by alias); 22 Aug 2014 05:31:30 -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 17734 invoked by uid 89); 22 Aug 2014 05:31:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Date: Fri, 22 Aug 2014 11:01:22 +0530 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH v1.1 20/20] Include config.h in MIN-CPPFLAGS Message-ID: <20140822053122.GF16835@spoyarek.pnq.redhat.com> References: <20140821175954.GA10983@spoyarek.pnq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140821175954.GA10983@spoyarek.pnq.redhat.com> User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) 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-$(