svn commit: trunk/uClibc

[psm at uclibc.org]

Author: psm
Date: 2006-01-30 13:01:49 -0800 (Mon, 30 Jan 2006)
New Revision: 13726

Log:
Undo -std=c99 and related -D__ASSEMBLER__

Modified:
   trunk/uClibc/Makerules
   trunk/uClibc/Rules.mak


Changeset:
Modified: trunk/uClibc/Makerules
===================================================================
--- trunk/uClibc/Makerules	2006-01-30 19:48:23 UTC (rev 13725)
+++ trunk/uClibc/Makerules	2006-01-30 21:01:49 UTC (rev 13726)
@@ -84,7 +84,7 @@
 disp_ld        = $($(DISP)_disp_ld)
 
 cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(^D))) $(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) $(CFLAGS-$(notdir $<)) $(CFLAGS-$(notdir $@))
-cmd_compile.S = $(cmd_compile.c) -D__ASSEMBLER__ $(ASFLAGS) $(ARCH_ASFLAGS) $(ASFLAGS-$(suffix $@)) $(ASFLAGS-$(notdir $<)) $(ASFLAGS-$(notdir $@))
+cmd_compile.S = $(cmd_compile.c) $(ASFLAGS) $(ARCH_ASFLAGS) $(ASFLAGS-$(suffix $@)) $(ASFLAGS-$(notdir $<)) $(ASFLAGS-$(notdir $@))
 cmd_compile.m = $(cmd_compile.c) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@))
 cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@))
 #cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@)) $(CFLAGS-multi-y)

Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2006-01-30 19:48:23 UTC (rev 13725)
+++ trunk/uClibc/Rules.mak	2006-01-30 21:01:49 UTC (rev 13726)
@@ -306,7 +306,7 @@
 CPU_CFLAGS += -fsigned-char
 
 # only i386 is known to work if compile.S gets -D__ASSEMBLER__
-CPU_CFLAGS += $(call check_gcc,-std=c99,)
+#CPU_CFLAGS += $(call check_gcc,-std=c99,)
 
 LDADD_LIBFLOAT=
 ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y)