From 01629105c2817a59a4f1f05039593f211cf5ddaa Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 14 Dec 1998 23:15:38 +0000 Subject: Patch from Ralf Corsepius to rename all .s files to .S in conformance with GNU conventions. This is a minor step along the way to supporting automake. --- make/Templates/Makefile.leaf | 6 +++--- make/Templates/Makefile.lib | 6 +++--- make/compilers/gcc-target-default.cfg | 9 +-------- 3 files changed, 7 insertions(+), 14 deletions(-) (limited to 'make') diff --git a/make/Templates/Makefile.leaf b/make/Templates/Makefile.leaf index 8d610b1c0e..d03155231d 100644 --- a/make/Templates/Makefile.leaf +++ b/make/Templates/Makefile.leaf @@ -17,10 +17,10 @@ CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o) H_FILES= -# Assembly source names, if any, go here -- minus the .s +# Assembly source names, if any, go here -- minus the .S S_PIECES= -S_FILES=$(S_PIECES:%=%.s) -S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) +S_FILES=$(S_PIECES:%=%.S) +S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) diff --git a/make/Templates/Makefile.lib b/make/Templates/Makefile.lib index 18baaedbaa..ebf9d66f68 100644 --- a/make/Templates/Makefile.lib +++ b/make/Templates/Makefile.lib @@ -19,10 +19,10 @@ CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o) H_FILES= -# Assembly source names, if any, go here -- minus the .s +# Assembly source names, if any, go here -- minus the .S S_PIECES= -S_FILES=$(S_PIECES:%=%.s) -S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) +S_FILES=$(S_PIECES:%=%.S) +S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg index c1b27435dc..0b758f1b53 100644 --- a/make/compilers/gcc-target-default.cfg +++ b/make/compilers/gcc-target-default.cfg @@ -188,19 +188,12 @@ ${ARCH}/%.o: %.c ${ARCH}/%.o: %.cc ${COMPILE.cc} -o $@ $< -${ARCH}/%.o: %.S - ${COMPILE.c} -DASM -o $@ $< - # strip out C++ style comments. -${ARCH}/%.o: %.s +${ARCH}/%.o: %.S sed -e 's/\/\/.*$$//' < $< | \ $(CPP) $(ASMFLAGS) -I. -I$(srcdir) -DASM - >$(ARCH)/$*.i $(AS) $(ASFLAGS) -o $@ $(ARCH)/$*.i -# $(CPP) $(CPPFLAGS) -DASM - < $< >$(ARCH)/$*.i -# $(AS) $(ASFLAGS) -o $@ $(ARCH)/$*.i -# $(RM) $(ARCH)/$*.i - # Specify our own default rule for this to prevent having CFLAGS and # CPPFLAGS being passed to linker # -- cgit v1.2.3