1 --- gcc-4.7.1/gcc/ada/gcc-interface/Makefile.in.orig 2012-07-10 17:33:42.146462985 +0200
2 +++ gcc-4.7.1/gcc/ada/gcc-interface/Makefile.in 2012-07-12 18:27:21.682409479 +0200
4 # CFLAGS is for the user to override to, e.g., do a bootstrap with -O2.
5 # BOOT_CFLAGS is the value of CFLAGS to pass
6 # to the stage2 and stage3 compilations
9 BOOT_CFLAGS = -O $(CFLAGS)
10 # These exists to be overridden by the t-* files, respectively.
12 @@ -105,12 +105,12 @@ TEXI2PDF = texi2pdf
13 GNATBIND_FLAGS = -static -x
15 ADAFLAGS = -W -Wall -gnatpg -gnata
16 -FORCE_DEBUG_ADAFLAGS = -g
17 +FORCE_DEBUG_ADAFLAGS =
18 NO_INLINE_ADAFLAGS = -fno-inline
19 NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls
20 NO_REORDER_ADAFLAGS = -fno-toplevel-reorder
21 GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc
22 -GNATLIBCFLAGS = -g -O2
24 # Pretend that _Unwind_GetIPInfo is available for the target by default. This
25 # should be autodetected during the configuration of libada and passed down to
26 # here, but we need something for --disable-libada and hope for the best.
27 --- gcc-4.7.1/libada/Makefile.in.orig 2012-06-12 17:12:37.000000000 +0200
28 +++ gcc-4.7.1/libada/Makefile.in 2012-07-12 18:27:53.482408144 +0200
29 @@ -59,7 +59,7 @@ LDFLAGS=
32 GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
33 -GNATLIBCFLAGS= -g -O2
35 GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \
36 -fexceptions -DIN_RTS @have_getipinfo@
38 --- gcc-4.7.1/libffi/Makefile.am.orig 2012-02-27 11:00:12.000000000 +0100
39 +++ gcc-4.7.1/libffi/Makefile.am 2012-07-12 18:28:20.115740360 +0200
42 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
44 -AM_CFLAGS = -Wall -g -fexceptions
45 +AM_CFLAGS = -Wall -fexceptions
47 # Build debug. Define FFI_DEBUG on the commandline so that, when building with
48 # MSVC, it can link against the debug CRT.
49 --- gcc-4.7.1/libffi/Makefile.in.orig 2012-06-14 10:48:08.000000000 +0200
50 +++ gcc-4.7.1/libffi/Makefile.in 2012-07-12 18:28:35.029073067 +0200
51 @@ -486,7 +486,7 @@ libffi_convenience_la_LIBADD = $(libffi_
52 libffi_convenience_la_DEPENDENCIES = $(libffi_la_DEPENDENCIES)
53 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
54 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
55 -AM_CFLAGS = -Wall -g -fexceptions $(am__append_2)
56 +AM_CFLAGS = -Wall -fexceptions $(am__append_2)
57 @LIBAT_BUILD_VERSIONED_SHLIB_FALSE@libffi_version_script =
58 @LIBAT_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libffi_version_script = -Wl,--version-script,libffi.map
59 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libffi_version_script = -Wl,-M,libffi.map-sun
60 --- gcc-4.7.1/libgcc/Makefile.in.orig 2012-05-24 16:59:38.000000000 +0200
61 +++ gcc-4.7.1/libgcc/Makefile.in 2012-07-12 18:28:59.042405393 +0200
64 # Options to use when compiling libgcc2.a.
66 -LIBGCC2_DEBUG_CFLAGS = -g
67 +LIBGCC2_DEBUG_CFLAGS =
68 LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \
69 $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \
70 -fbuilding-libgcc -fno-stack-protector \
71 --- gcc-4.7.1/libjava/classpath/tools/Makefile.am.orig 2011-09-29 13:37:47.000000000 +0200
72 +++ gcc-4.7.1/libjava/classpath/tools/Makefile.am 2012-07-12 18:29:33.452403949 +0200
74 if JAVA_MAINTAINER_MODE
75 ## Compile ASM separately as it is latin-1 encoded.
76 AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
77 - $$AC -g -w -d $(srcdir)/asm @asm.lst
78 - $(JCOMPILER) $(USE_JAVAC_FLAGS) -g -d $(srcdir)/classes @classes.lst @vm-tools.lst
79 + $$AC -w -d $(srcdir)/asm @asm.lst
80 + $(JCOMPILER) $(USE_JAVAC_FLAGS) -d $(srcdir)/classes @classes.lst @vm-tools.lst
83 ## Copy over tools resource files.
84 --- gcc-4.7.1/libjava/classpath/tools/Makefile.in.orig 2011-09-29 13:37:47.000000000 +0200
85 +++ gcc-4.7.1/libjava/classpath/tools/Makefile.in 2012-07-12 18:29:52.035736502 +0200
88 cat classes.lst asm.lst vm-tools.lst > all-classes.lst
89 @JAVA_MAINTAINER_MODE_TRUE@ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
90 -@JAVA_MAINTAINER_MODE_TRUE@ $$AC -g -w -d $(srcdir)/asm @asm.lst
91 -@JAVA_MAINTAINER_MODE_TRUE@ $(JCOMPILER) $(USE_JAVAC_FLAGS) -g -d $(srcdir)/classes @classes.lst @vm-tools.lst
92 +@JAVA_MAINTAINER_MODE_TRUE@ $$AC -w -d $(srcdir)/asm @asm.lst
93 +@JAVA_MAINTAINER_MODE_TRUE@ $(JCOMPILER) $(USE_JAVAC_FLAGS) -d $(srcdir)/classes @classes.lst @vm-tools.lst
94 @list=`cd $(srcdir)/resource && find gnu/classpath/tools com/sun/tools/javac \
95 sun/rmi/rmic $(GJDOC_EX) -name \*.properties -print -o -name \*.jav -print`; \
97 --- gcc-4.7.1/libjava/Makefile.am.orig 2011-08-05 16:37:48.000000000 +0200
98 +++ gcc-4.7.1/libjava/Makefile.am 2012-07-12 18:30:07.649069180 +0200
100 ## Extra CFLAGS used for JNI C sources shared with GNU Classpath.
101 PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
105 JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
107 LIBFFIINCS = @LIBFFIINCS@
108 --- gcc-4.7.1/libjava/Makefile.in.orig 2012-06-14 10:48:08.000000000 +0200
109 +++ gcc-4.7.1/libjava/Makefile.in 2012-07-12 18:30:20.642401968 +0200
110 @@ -1032,7 +1032,7 @@
111 @BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS =
112 @BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE@LIBGCJ_REDUCED_REFLECTION_FLAGS = -freduced-reflection
113 PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
116 JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
117 AM_CPPFLAGS = -I$(top_srcdir) \
118 -Iinclude -I$(top_srcdir)/include \
119 --- gcc-4.7.1/libjava/testsuite/Makefile.am.orig 2010-05-04 00:37:50.000000000 +0200
120 +++ gcc-4.7.1/libjava/testsuite/Makefile.am 2012-07-12 18:30:54.965733863 +0200
122 testtmpdir=`echo $$test | sed -e 's,/,_,g'`T; \
123 rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \
124 if test -n "$$testdep"; then \
125 - $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
126 + $(GCJ) -C -w --encoding=UTF-8 -bootclasspath \
127 $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \
128 -d $$testtmpdir $(srcdir)/$$testdep || exit; \
130 - $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
131 + $(GCJ) -C -w --encoding=UTF-8 -bootclasspath \
132 $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \
133 -d $$testtmpdir $(srcdir)/$$test || exit; \
135 --- gcc-4.7.1/libjava/testsuite/Makefile.in.orig 2012-05-21 20:14:01.000000000 +0200
136 +++ gcc-4.7.1/libjava/testsuite/Makefile.in 2012-07-12 18:31:09.359066590 +0200
137 @@ -569,11 +569,11 @@
138 @JAVA_MAINTAINER_MODE_TRUE@ testtmpdir=`echo $$test | sed -e 's,/,_,g'`T; \
139 @JAVA_MAINTAINER_MODE_TRUE@ rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \
140 @JAVA_MAINTAINER_MODE_TRUE@ if test -n "$$testdep"; then \
141 -@JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
142 +@JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -w --encoding=UTF-8 -bootclasspath \
143 @JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \
144 @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir $(srcdir)/$$testdep || exit; \
145 @JAVA_MAINTAINER_MODE_TRUE@ fi; \
146 -@JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
147 +@JAVA_MAINTAINER_MODE_TRUE@ $(GCJ) -C -w --encoding=UTF-8 -bootclasspath \
148 @JAVA_MAINTAINER_MODE_TRUE@ $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \
149 @JAVA_MAINTAINER_MODE_TRUE@ -d $$testtmpdir $(srcdir)/$$test || exit; \
150 @JAVA_MAINTAINER_MODE_TRUE@ case "$$test" in \
151 --- gcc-4.7.1/libstdc++-v3/include/Makefile.am.orig 2012-03-23 12:00:54.000000000 +0100
152 +++ gcc-4.7.1/libstdc++-v3/include/Makefile.am 2012-07-12 18:31:29.102399096 +0200
153 @@ -1154,22 +1154,22 @@
154 # Build two precompiled C++ includes, stdc++.h.gch/*.gch
155 ${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source}
156 -mkdir -p ${pch1_output_builddir}
157 - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g -std=gnu++0x ${pch1_source} \
158 + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -std=gnu++0x ${pch1_source} \
161 ${pch1b_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source}
162 -mkdir -p ${pch1_output_builddir}
163 - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch1_source} -o $@
164 + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 ${pch1_source} -o $@
166 # Build a precompiled TR1 include, stdtr1c++.h.gch/O2.gch
167 ${pch2_output}: ${pch2_source} ${pch1_output}
168 -mkdir -p ${pch2_output_builddir}
169 - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch2_source} -o $@
170 + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 ${pch2_source} -o $@
172 # Build a precompiled extension include, extc++.h.gch/O2.gch
173 ${pch3_output}: ${pch3_source} ${pch2_output}
174 -mkdir -p ${pch3_output_builddir}
175 - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch3_source} -o $@
176 + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 ${pch3_source} -o $@
178 # For robustness sake (in light of junk files or in-source
179 # configuration), copy from the build or source tree to the install
180 --- gcc-4.7.1/libstdc++-v3/include/Makefile.in.orig 2012-03-23 12:00:54.000000000 +0100
181 +++ gcc-4.7.1/libstdc++-v3/include/Makefile.in 2012-07-12 18:31:43.922398474 +0200
182 @@ -1543,22 +1543,22 @@
183 # Build two precompiled C++ includes, stdc++.h.gch/*.gch
184 ${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source}
185 -mkdir -p ${pch1_output_builddir}
186 - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g -std=gnu++0x ${pch1_source} \
187 + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -std=gnu++0x ${pch1_source} \
190 ${pch1b_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source}
191 -mkdir -p ${pch1_output_builddir}
192 - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch1_source} -o $@
193 + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 ${pch1_source} -o $@
195 # Build a precompiled TR1 include, stdtr1c++.h.gch/O2.gch
196 ${pch2_output}: ${pch2_source} ${pch1_output}
197 -mkdir -p ${pch2_output_builddir}
198 - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch2_source} -o $@
199 + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 ${pch2_source} -o $@
201 # Build a precompiled extension include, extc++.h.gch/O2.gch
202 ${pch3_output}: ${pch3_source} ${pch2_output}
203 -mkdir -p ${pch3_output_builddir}
204 - $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch3_source} -o $@
205 + $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 ${pch3_source} -o $@
207 # For robustness sake (in light of junk files or in-source
208 # configuration), copy from the build or source tree to the install
209 --- gcc-4.7.1/Makefile.in.orig 2012-05-16 17:54:24.000000000 +0200
210 +++ gcc-4.7.1/Makefile.in 2012-07-12 18:32:07.075730835 +0200
213 # Flags to pass to stage2 and later makes. They are defined
214 # here so that they can be overridden by Makefile fragments.
218 BOOT_ADAFLAGS=-gnatpg -gnata
221 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
222 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
223 LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
224 -GOCFLAGS_FOR_TARGET = -O2 -g
225 +GOCFLAGS_FOR_TARGET = -O2
227 FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
228 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@