1 files changed, 10 insertions, 7 deletions
diff --git a/Rules.mak b/Rules.mak
index b7a91b63b..866e555eb 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -166,16 +166,17 @@ LD_END_GROUP:= -Wl,--end-group
 endif
 CHECKED_LDFLAGS := $(call check_ld,$(LD),--warn-common,)
+#CHECKED_LDFLAGS := $(call check_ld,$(LD),-static-libgcc,)
 # Pin CHECKED_CFLAGS with := so it's only evaluated once.
 CHECKED_CFLAGS:=$(call check_cc,$(CC),-Wall,)
-CHECKED_CFLAGS+=$(call check_cc,$(HOSTCC),-Werror,)
 CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wstrict-prototypes,)
 CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wshadow,)
 CHECKED_CFLAGS+=$(call check_cc,$(CC),-funsigned-char,)
 CHECKED_CFLAGS+=$(call check_cc,$(CC),-mmax-stack-frame=256,)
-CHECKED_CFLAGS+=$(call check_cc,$(CC),-fno-builtin-strlen)
+CHECKED_CFLAGS+=$(call check_cc,$(CC),-fno-builtin-strlen,)
-CHECKED_CFLAGS+=$(call check_cc,$(CC),-finline-limit=0)
+CHECKED_CFLAGS+=$(call check_cc,$(CC),-finline-limit=0,)
+CHECKED_CFLAGS+=$(call check_cc,$(CC),-static-libgcc,)
 # Preemptively pin this too.
 PROG_CFLAGS:=
@@ -216,11 +217,13 @@ endif
 ifeq ($(strip $(TARGET_ARCH)),i386)
        OPTIMIZATION+=$(call check_cc,$(CC),-march=i386,)
 # gcc-4.0 and older seem to benefit from these
-#ifneq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)
+ifneq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)
        OPTIMIZATION+=$(call check_cc,$(CC),-mpreferred-stack-boundary=2,)
-        OPTIMIZATION+=$(call check_cc,$(CC),-falign-functions=1 -falign-jumps=1 -falign-loops=1,\
+        OPTIMIZATION+=$(call check_cc,$(CC),-falign-functions=1 -falign-jumps=1 -falign-loops=1, -malign-functions=0 -malign-jumps=0 -malign-loops=0,)
-                -malign-functions=0 -malign-jumps=0 -malign-loops=0)
-#endif # gcc-4.0 and older
+        # gcc 4.1 produces many broken, totally invalid warnings
+        CHECKED_CFLAGS+=$(call check_cc,$(CC),-Werror,)
+endif # gcc-4.0 and older
 # gcc-4.1 and beyond seem to benefit from these
 ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)

diff --git a/Rules.mak b/Rules.mak index b7a91b63b..866e555eb 100644 --- a/Rules.mak +++ b/Rules.mak
@@ -166,16 +166,17 @@ LD_END_GROUP:= -Wl,--end-group
166	endif	166	endif
167		167
168	CHECKED_LDFLAGS := $(call check_ld,$(LD),--warn-common,)	168	CHECKED_LDFLAGS := $(call check_ld,$(LD),--warn-common,)
		169	#CHECKED_LDFLAGS := $(call check_ld,$(LD),-static-libgcc,)
169		170
170	# Pin CHECKED_CFLAGS with := so it's only evaluated once.	171	# Pin CHECKED_CFLAGS with := so it's only evaluated once.
171	CHECKED_CFLAGS:=$(call check_cc,$(CC),-Wall,)	172	CHECKED_CFLAGS:=$(call check_cc,$(CC),-Wall,)
172	CHECKED_CFLAGS+=$(call check_cc,$(HOSTCC),-Werror,)
173	CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wstrict-prototypes,)	173	CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wstrict-prototypes,)
174	CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wshadow,)	174	CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wshadow,)
175	CHECKED_CFLAGS+=$(call check_cc,$(CC),-funsigned-char,)	175	CHECKED_CFLAGS+=$(call check_cc,$(CC),-funsigned-char,)
176	CHECKED_CFLAGS+=$(call check_cc,$(CC),-mmax-stack-frame=256,)	176	CHECKED_CFLAGS+=$(call check_cc,$(CC),-mmax-stack-frame=256,)
177	CHECKED_CFLAGS+=$(call check_cc,$(CC),-fno-builtin-strlen)	177	CHECKED_CFLAGS+=$(call check_cc,$(CC),-fno-builtin-strlen,)
178	CHECKED_CFLAGS+=$(call check_cc,$(CC),-finline-limit=0)	178	CHECKED_CFLAGS+=$(call check_cc,$(CC),-finline-limit=0,)
		179	CHECKED_CFLAGS+=$(call check_cc,$(CC),-static-libgcc,)
179		180
180	# Preemptively pin this too.	181	# Preemptively pin this too.
181	PROG_CFLAGS:=	182	PROG_CFLAGS:=
@@ -216,11 +217,13 @@ endif
216	ifeq ($(strip $(TARGET_ARCH)),i386)	217	ifeq ($(strip $(TARGET_ARCH)),i386)
217	OPTIMIZATION+=$(call check_cc,$(CC),-march=i386,)	218	OPTIMIZATION+=$(call check_cc,$(CC),-march=i386,)
218	# gcc-4.0 and older seem to benefit from these	219	# gcc-4.0 and older seem to benefit from these
219	#ifneq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)	220	ifneq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)
220	OPTIMIZATION+=$(call check_cc,$(CC),-mpreferred-stack-boundary=2,)	221	OPTIMIZATION+=$(call check_cc,$(CC),-mpreferred-stack-boundary=2,)
221	OPTIMIZATION+=$(call check_cc,$(CC),-falign-functions=1 -falign-jumps=1 -falign-loops=1,\	222	OPTIMIZATION+=$(call check_cc,$(CC),-falign-functions=1 -falign-jumps=1 -falign-loops=1, -malign-functions=0 -malign-jumps=0 -malign-loops=0,)
222	-malign-functions=0 -malign-jumps=0 -malign-loops=0)	223
223	#endif # gcc-4.0 and older	224	# gcc 4.1 produces many broken, totally invalid warnings
		225	CHECKED_CFLAGS+=$(call check_cc,$(CC),-Werror,)
		226	endif # gcc-4.0 and older
224		227
225	# gcc-4.1 and beyond seem to benefit from these	228	# gcc-4.1 and beyond seem to benefit from these
226	ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)	229	ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0)