From 068231cd91007d845932040949e1dc487fbc7c5e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 15:51:23 +0000 Subject: 2000-09-04 Ralf Corsepius * bootloader/Makefile.am, clock/Makefile.am, console/Makefile.am, irq/Makefile.am, motorola/Makefile.am, openpic/Makefile.am, pci/Makefile.am, residual/Makefile.am, start/Makefile.am, startup/Makefile.am, vectors/Makefile.am, wrapup/Makefile.am: Include compile.am --- c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 8 ++++++++ c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am | 1 + c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am | 9 +++++---- 13 files changed, 26 insertions(+), 5 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 01837a1df5..095f10553c 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,11 @@ + + * Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros. + Switch to GNU canonicalization. + +2000-09-29 Charles-Antoine Gauthier + + * startup/linkcmds: Added lines so DWARF debug information + would be available. Otherwise gdb complains that the offsets for the debug info are incorrect and doesn't load the files. 2000-09-04 Ralf Corsepius diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am index 398dee820e..5ebcd76404 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am @@ -17,6 +17,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # @@ -28,7 +29,8 @@ include $(top_srcdir)/../../../../../../automake/lib.am CFLAGS_DEBUG_V = $(CFLAGS_OPTIMIZE_V) AM_CPPFLAGS += -D__BOOT__ -DDEBUG -mrelocatable -AM_CFLAGS += -msoft-float -mstrict-align -fno-builtin -Wall -mmultiple -mstring -O2 -fomit-frame-pointer -ffixed-r13 -mno-sdata +AM_CFLAGS += -msoft-float -mstrict-align -fno-builtin -Wall -mmultiple \ + -mstring -O2 -fomit-frame-pointer -ffixed-r13 -mno-sdata IMAGES = rtems.gz diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am index 1206b032bb..c41be0decc 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am @@ -12,6 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am index 360e36037d..5c75d6b180 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am @@ -15,6 +15,7 @@ H_FILES = ../../shared/console/consoleIo.h ../../shared/console/keyboard.h \ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am index da96801117..74b36f515d 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am @@ -18,6 +18,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am index bd50126c27..9994231c1d 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am @@ -15,6 +15,7 @@ H_FILES = ../../shared/motorola/motorola.h OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am index 03ed4ac63c..2677c434b8 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am @@ -13,6 +13,7 @@ H_FILES = ../../shared/openpic/openpic.h OBJS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE)/bsp: diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am index 9334f0ffb2..0e004863c7 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am @@ -14,6 +14,7 @@ H_FILES = ../../shared/pci/pci.h OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am index d5382769d6..4b8ac9c49f 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am @@ -14,6 +14,7 @@ H_FILES = ../../shared/residual/pnp.h ../../shared/residual/residual.h OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am index f0c6e6180f..dba967e3d8 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am @@ -14,6 +14,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am index c1ca73b2f5..1aff1f86ee 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am @@ -13,6 +13,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am index 5d158dbe4f..87d9c03608 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am @@ -17,6 +17,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am index bb14a334bb..c24d9864c0 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am @@ -8,13 +8,14 @@ BSP_PIECES = clock console irq openpic pci residual startup vectors motorola # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/powerpc/new_exception_processing/$(ARCH)/*.rel) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.o) \ + $(wildcard ../../../../libcpu/powerpc/new_exception_processing/$(ARCH)/*.rel) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # -- cgit v1.2.3