svn commit: trunk/uClibc

[psm at uclibc.org]

Author: psm
Date: 2005-10-16 17:09:37 -0700 (Sun, 16 Oct 2005)
New Revision: 11880

Log:
Undo -combine addition, check_gcc can't cope with it

Modified:
   trunk/uClibc/Rules.mak


Changeset:
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2005-10-16 22:13:27 UTC (rev 11879)
+++ trunk/uClibc/Rules.mak	2005-10-17 00:09:37 UTC (rev 11880)
@@ -260,9 +260,6 @@
 # Use the gcc 3.4 -funit-at-a-time optimization when available
 OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,)
 
-# gcc-4.1 fails if -combine is not used and we compile all .c to one object
-CFLAGS_FAIL := $(call check_gcc,-combine,)
-
 # Add a bunch of extra pedantic annoyingly strict checks
 XWARNINGS=$(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
 XARCH_CFLAGS=$(subst ",, $(strip $(ARCH_CFLAGS)))
@@ -292,7 +289,7 @@
 endif
 
 # Some nice CFLAGS to work with
-CFLAGS:=$(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) $(CFLAGS_FAIL) \
+CFLAGS:=$(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \
 	-fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
 LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc -z defs