Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> to rename all

.s files to .S in conformance with GNU conventions.  This is a
minor step along the way to supporting automake.

c/src/exec/score/cpu/a29k/Makefile.in

@@ -22,11 +22,11 @@ H_FILES=$(srcdir)/cpu.h $(srcdir)/a29k.h $(srcdir)/a29ktypes.h
 EXTERNAL_H_FILES = $(srcdir)/asm.h $(srcdir)/amd.ah \
       $(srcdir)/pswmacro.ah $(srcdir)/register.ah
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 #  Normally cpu_asm and rtems are assembly files
 S_PIECES=cpu_asm sig
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/exec/score/cpu/hppa1.1/Makefile.in

@@ -23,8 +23,8 @@ EXTERNAL_H_FILES =
 
 # Assembly source names, if any, go here -- minus the .s
 S_PIECES=cpu_asm rtems
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/exec/score/cpu/i386/Makefile.in

@@ -21,10 +21,10 @@ H_FILES=$(srcdir)/cpu.h $(srcdir)/i386.h $(srcdir)/i386types.h
 # i386.h is handled specially
 EXTERNAL_H_FILES = $(srcdir)/asm.h
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=cpu_asm rtems
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/exec/score/cpu/i960/Makefile.in

@@ -20,10 +20,10 @@ H_FILES=$(srcdir)/cpu.h $(srcdir)/i960.h $(srcdir)/i960types.h
 # H_FILES that get installed externally
 EXTERNAL_H_FILES = $(srcdir)/asm.h
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=cpu_asm rtems
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/exec/score/cpu/m68k/Makefile.in

@@ -21,10 +21,10 @@ H_FILES=$(srcdir)/cpu.h $(srcdir)/m68k.h $(srcdir)/m68ktypes.h
 EXTERNAL_H_FILES = $(srcdir)/asm.h $(srcdir)/m68302.h $(srcdir)/m68360.h \
 	$(srcdir)/qsm.h $(srcdir)/sim.h
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=cpu_asm rtems
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/exec/score/cpu/no_cpu/Makefile.in

@@ -21,11 +21,11 @@ H_FILES=$(srcdir)/cpu.h $(srcdir)/no_cpu.h $(srcdir)/no_cputypes.h
 # H_FILES that get installed externally
 EXTERNAL_H_FILES = $(srcdir)/asm.h
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 #  Normally cpu_asm and rtems are assembly files
 S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/exec/score/cpu/powerpc/Makefile.in

@@ -21,11 +21,11 @@ H_FILES=$(srcdir)/cpu.h $(srcdir)/ppc.h $(srcdir)/ppctypes.h
 # H_FILES that get installed externally
 EXTERNAL_H_FILES = $(srcdir)/asm.h
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 #  Normally cpu_asm and rtems are assembly files
 S_PIECES=cpu_asm rtems
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
@@ -73,7 +73,7 @@ preinstall: $(ARCH) \
 # we will share the basic cpu file
 	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 # make a link in case we are not compiling in the source directory
-	test -f irq_stub.s || $(LN) -s $(srcdir)/irq_stub.s irq_stub.s
+	#test -f irq_stub.s || $(LN) -s $(srcdir)/irq_stub.s irq_stub.s
 
 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@

c/src/exec/score/cpu/sh/Makefile.in

@@ -27,11 +27,11 @@ H_FILES= \
 EXTERNAL_H_FILES = \
 	$(srcdir)/asm.h
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 #  Normally cpu_asm and rtems are assembly files
 S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/exec/score/cpu/sparc/Makefile.in

@@ -20,10 +20,10 @@ H_FILES=$(srcdir)/cpu.h $(srcdir)/sparc.h $(srcdir)/sparctypes.h
 # H_FILES that get installed externally
 EXTERNAL_H_FILES = $(srcdir)/asm.h $(srcdir)/erc32.h
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=cpu_asm rtems
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/a29k/portsw/console/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
 H_FILES=$(srcdir)/concntl.h
 
-# 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_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+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)

c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+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)

c/src/lib/libbsp/a29k/portsw/start/Makefile.in

@@ -15,10 +15,10 @@ C_O_FILES=$(C_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=crt0 register
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+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)

c/src/lib/libbsp/a29k/portsw/startup/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=ramlink romlink $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=start
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in

@@ -8,10 +8,18 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup tty shmsupp
+BSP_PIECES=startup tty
 # pieces to pick up out of libcpu/hppa
 CPU_PIECES=clock milli timer
-GENERIC_PIECES=shmdr
+GENERIC_PIECES=
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+ifeq ($(HAS_MP),yes)
+GENERIC_PIECES += shmdr
+BSP_PIECES += shmsupp
+endif
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
@@ -21,9 +29,6 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
          ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libbsp.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #

c/src/lib/libbsp/i386/force386/start/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=start
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i386/force386/startup/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=ldsegs
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i386/force386/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i386/force386/wrapup/Makefile.in

@@ -8,17 +8,22 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console shmsupp timer
+BSP_PIECES=startup clock console timer
-GENERIC_PIECES=shmdr
+GENERIC_PIECES=
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+ifeq ($(HAS_MP),yes)
+GENERIC_PIECES += shmdr
+BSP_PIECES += shmsupp
+endif
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
      $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libbsp.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #

c/src/lib/libbsp/i386/go32/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+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)

c/src/lib/libbsp/i386/i386ex/clock/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+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)

c/src/lib/libbsp/i386/i386ex/console/Makefile.in

@@ -19,10 +19,10 @@ C_O_FILES=$(C_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_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+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)

c/src/lib/libbsp/i386/i386ex/start/Makefile.in

@@ -18,10 +18,10 @@ C_O_FILES=$(C_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=start
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i386/i386ex/startup/Makefile.in

@@ -18,11 +18,11 @@ C_O_FILES=$(C_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
 # removed initcsu piece, ldsegs piece and flush
 S_PIECES=irq_asm
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(srcdir)/linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i386/i386ex/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+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)

c/src/lib/libbsp/i386/pc386/console/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=videoAsm
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i386/pc386/startup/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=ldsegs irq_asm
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i386/pc386/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i960/cvme961/start/Makefile.in

@@ -15,10 +15,10 @@ C_O_FILES=$(C_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=start
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i960/cvme961/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in

@@ -8,17 +8,22 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console shmsupp timer
+BSP_PIECES=startup clock console timer
-GENERIC_PIECES=shmdr
+GENERIC_PIECES=
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+ifeq ($(HAS_MP),yes)
+GENERIC_PIECES += shmdr
+BSP_PIECES += shmsupp
+endif
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
      $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libbsp.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #

c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/gen68302/start/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=start302
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/gen68302/start302/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=start302
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/gen68340/console/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=Modif_cpu_asm
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/gen68340/start/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=start340
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/gen68340/start340/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=start340
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/gen68360/start/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=start360
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/gen68360/start360/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=start360
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/idp/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in

@@ -8,17 +8,22 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console shmsupp timer
+BSP_PIECES=startup clock console timer
-GENERIC_PIECES=shmdr
+GENERIC_PIECES=
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+ifeq ($(HAS_MP),yes)
+GENERIC_PIECES += shmdr
+BSP_PIECES += shmsupp
+endif
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
      $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libbsp.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #

c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/mvme147/timer/timerisr.s

@@ -1,28 +0,0 @@
-/*  timer_isr()
- *
- *  This routine provides the ISR for the PCC timer on the MVME147
- *  board.   The timer is set up to generate an interrupt at maximum
- *  intervals.
- *
- *  MVME147 port for TNI - Telecom Bretagne
- *  by Dominique LE CAMPION (Dominique.LECAMPION@enst-bretagne.fr)
- *  May 1996
- *
- *  $Id$
- */
-
-#include "asm.h"
-
-BEGIN_CODE
-
-.set T1_CONTROL_REGISTER,  0xfffe1018    | timer 1 control register
-
-        PUBLIC (timerisr)
-SYM (timerisr):
-	orb	#0x80, T1_CONTROL_REGISTER | clear T1 int status bit
-        addql   #1, SYM (Ttimer_val)     | increment timer value
-end_timerisr:
-	rte	
-
-END_CODE
-END

c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in

@@ -8,8 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console timer # shmsupp
+BSP_PIECES=startup clock console timer
-GENERIC_PIECES=# shmdr
+GENERIC_PIECES=
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \

c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in

@@ -15,10 +15,10 @@ C_PIECES=timer
 C_FILES=$(C_PIECES:%=%.c)
 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 H_FILES=
 

c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in

@@ -8,17 +8,22 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console timer shmsupp
+BSP_PIECES=startup clock console timer
-GENERIC_PIECES=shmdr
+GENERIC_PIECES=
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+ifeq ($(HAS_MP),yes)
+GENERIC_PIECES += shmdr
+BSP_PIECES += shmsupp
+endif
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
      $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libbsp.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #

c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)

c/src/lib/libbsp/m68k/ods68302/start/Makefile.in

@@ -24,10 +24,10 @@ C_O_FILES=$(C_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=$(RESET_SRC)
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(S_O_FILES) $(C_O_FILES)

c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in

@@ -24,10 +24,10 @@ C_O_FILES=$(C_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=$(RESET_SRC)
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(S_O_FILES) $(C_O_FILES)

c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in

@@ -17,10 +17,10 @@ C_O_FILES=$(C_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=timerisr
-S_FILES=$(S_PIECES:%=%.s)
+S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)