Undo -std=c99 and related -D__ASSEMBLER__

diff --git a/Makerules b/Makerules
index 37d9de5..f83eb11 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -84,7 +84,7 @@ disp_ar        = $($(DISP)_disp_ar)
 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)

diff --git a/Rules.mak b/Rules.mak
index d23e158..f439bab 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -306,7 +306,7 @@ CPU_CFLAGS=$(subst ",, $(strip $(CPU_CFLAGS-y)))
 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)