|
From: <sv...@va...> - 2009-02-25 23:25:09
|
Author: njn Date: 2009-02-25 23:25:02 +0000 (Wed, 25 Feb 2009) New Revision: 9268 Log: Merge r9267 (kill WERROR) from the trunk. Modified: branches/DARWIN/Makefile.flags.am branches/DARWIN/Makefile.tool-tests.am branches/DARWIN/massif/perf/Makefile.am branches/DARWIN/perf/Makefile.am Modified: branches/DARWIN/Makefile.flags.am =================================================================== --- branches/DARWIN/Makefile.flags.am 2009-02-25 23:19:46 UTC (rev 9267) +++ branches/DARWIN/Makefile.flags.am 2009-02-25 23:25:02 UTC (rev 9268) @@ -30,7 +30,7 @@ -DVGA_x86=1 \ -DVGO_linux=1 \ -DVGP_x86_linux=1 -AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ +AM_CFLAGS_X86_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = @FLAG_M32@ -g @@ -39,7 +39,7 @@ -DVGA_amd64=1 \ -DVGO_linux=1 \ -DVGP_amd64_linux=1 -AM_CFLAGS_AMD64_LINUX = $(WERROR) @FLAG_M64@ -fomit-frame-pointer \ +AM_CFLAGS_AMD64_LINUX = @FLAG_M64@ -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = @FLAG_M64@ -g @@ -48,7 +48,7 @@ -DVGA_ppc32=1 \ -DVGO_linux=1 \ -DVGP_ppc32_linux=1 -AM_CFLAGS_PPC32_LINUX = $(WERROR) @FLAG_M32@ $(AM_CFLAGS_BASE) +AM_CFLAGS_PPC32_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC32_LINUX = @FLAG_M32@ -g AM_FLAG_M3264_PPC64_LINUX = @FLAG_M64@ @@ -56,7 +56,7 @@ -DVGA_ppc64=1 \ -DVGO_linux=1 \ -DVGP_ppc64_linux=1 -AM_CFLAGS_PPC64_LINUX = $(WERROR) @FLAG_M64@ $(AM_CFLAGS_BASE) +AM_CFLAGS_PPC64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC64_LINUX = @FLAG_M64@ -g AM_FLAG_M3264_PPC32_AIX5 = @FLAG_MAIX32@ @@ -64,7 +64,7 @@ -DVGA_ppc32=1 \ -DVGO_aix5=1 \ -DVGP_ppc32_aix5=1 -AM_CFLAGS_PPC32_AIX5 = $(WERROR) @FLAG_MAIX32@ -mcpu=powerpc $(AM_CFLAGS_BASE) +AM_CFLAGS_PPC32_AIX5 = @FLAG_MAIX32@ -mcpu=powerpc $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC32_AIX5 = @FLAG_MAIX32@ -mcpu=powerpc -g AM_FLAG_M3264_PPC64_AIX5 = @FLAG_MAIX64@ @@ -72,7 +72,7 @@ -DVGA_ppc64=1 \ -DVGO_aix5=1 \ -DVGP_ppc64_aix5=1 -AM_CFLAGS_PPC64_AIX5 = $(WERROR) @FLAG_MAIX64@ -mcpu=powerpc64 $(AM_CFLAGS_BASE) +AM_CFLAGS_PPC64_AIX5 = @FLAG_MAIX64@ -mcpu=powerpc64 $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC64_AIX5 = @FLAG_MAIX64@ -mcpu=powerpc64 -g AM_FLAG_M3264_X86_DARWIN = -arch i386 Modified: branches/DARWIN/Makefile.tool-tests.am =================================================================== --- branches/DARWIN/Makefile.tool-tests.am 2009-02-25 23:19:46 UTC (rev 9267) +++ branches/DARWIN/Makefile.tool-tests.am 2009-02-25 23:25:02 UTC (rev 9268) @@ -9,8 +9,8 @@ -DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1 # Nb: Tools need to augment these flags with an arch-selection option, such # as $(AM_FLAG_M3264_PRI). -AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -AM_CXXFLAGS = $(WERROR) -Winline -Wall -Wshadow -g +AM_CFLAGS = -Winline -Wall -Wshadow -g +AM_CXXFLAGS = -Winline -Wall -Wshadow -g # On Darwin, for a program 'p', the DWARF debug info is stored in the Modified: branches/DARWIN/massif/perf/Makefile.am =================================================================== --- branches/DARWIN/massif/perf/Makefile.am 2009-02-25 23:19:46 UTC (rev 9267) +++ branches/DARWIN/massif/perf/Makefile.am 2009-02-25 23:25:02 UTC (rev 9268) @@ -8,6 +8,6 @@ check_PROGRAMS = \ many-xpts -AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -O $(AM_FLAG_M3264_PRI) +AM_CFLAGS = -Winline -Wall -Wshadow -g -O $(AM_FLAG_M3264_PRI) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CXXFLAGS = $(AM_CFLAGS) Modified: branches/DARWIN/perf/Makefile.am =================================================================== --- branches/DARWIN/perf/Makefile.am 2009-02-25 23:19:46 UTC (rev 9267) +++ branches/DARWIN/perf/Makefile.am 2009-02-25 23:25:02 UTC (rev 9268) @@ -19,7 +19,7 @@ bigcode bz2 fbench ffbench heap sarp tinycc AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -O $(AM_FLAG_M3264_PRI) +AM_CFLAGS = -Winline -Wall -Wshadow -g -O $(AM_FLAG_M3264_PRI) AM_CXXFLAGS = $(AM_CFLAGS) # Extra stuff |