From 6af91aa03ac4492a6a1c884b3c02f2b0ce5f9d4f Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 30 Jan 2006 21:01:49 +0000 Subject: Undo -std=c99 and related -D__ASSEMBLER__ --- Makerules | 2 +- Rules.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makerules b/Makerules index 37d9de503..f83eb1139 100644 --- 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 d23e1583b..f439baba4 100644 --- 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) -- cgit v1.2.3