From 11a4a3b28309aad4031127c74bd20c81fa54e33f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 9 Dec 2003 14:52:00 +0000 Subject: 2003-12-09 Ralf Corsepius * startup/Makefile.am: Misc cleanups and fixes. * startup/linkcmds: Preparations to gcc-3.3.x. * wrapup/Makefile.am: Misc cleanups and fixes. --- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 6 ++++++ c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am | 14 ++++++-------- c/src/lib/libbsp/powerpc/gen405/startup/linkcmds | 2 +- c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am | 5 ++--- 4 files changed, 15 insertions(+), 12 deletions(-) (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index 7e5fb206fe..3cba62b847 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,9 @@ +2003-12-09 Ralf Corsepius + + * startup/Makefile.am: Misc cleanups and fixes. + * startup/linkcmds: Preparations to gcc-3.3.x. + * wrapup/Makefile.am: Misc cleanups and fixes. + 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am index a52f1ccb58..2c33a3ead5 100644 --- a/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am @@ -22,18 +22,16 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds - -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c linkcmds linkcmds.dl setvec.c +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/startup/linkcmds b/c/src/lib/libbsp/powerpc/gen405/startup/linkcmds index 45a855af95..c82667425a 100644 --- a/c/src/lib/libbsp/powerpc/gen405/startup/linkcmds +++ b/c/src/lib/libbsp/powerpc/gen405/startup/linkcmds @@ -83,7 +83,7 @@ SECTIONS { *(.data) *(.data1) - *(.gnu.linkonce.d*) + *(.data.* .gnu.linkonce.d*) PROVIDE (__SDATA_START__ = .); *(.sdata) *(.gnu.linkonce.s.*) diff --git a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am index ec899f48a5..efdc7088a7 100644 --- a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am @@ -7,9 +7,8 @@ BSP_PIECES = startup dlentry CPU_PIECES = clock timer console tty_drv vectors ictrl # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) ../@exceptions@/$(ARCH)/rtems-cpu.rel \ - $(foreach piece, $(CPU_PIECES), \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + ../@exceptions@/$(ARCH)/rtems-cpu.rel $(foreach piece, $(CPU_PIECES), \ ../../../../libcpu/$(RTEMS_CPU)/ppc403/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3