diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 14:52:05 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 14:52:05 +0000 |
| commit | 7c2239fe08f650cfdb3a328a793983949c920c75 (patch) | |
| tree | 291f867f96a7b2eac22521d123eeb6a6abb27cfd /c/src/lib/libbsp/powerpc | |
| parent | 2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-7c2239fe08f650cfdb3a328a793983949c920c75.tar.bz2 | |
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* startup/linkcmds: Preparations for gcc-3.3.x.
* wrapup/Makefile.am: Misc cleanups and fixes.
Diffstat (limited to '')
5 files changed, 19 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index eaaa1c16db..2e942bd97c 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog @@ -1,3 +1,10 @@ +2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + * startup/linkcmds: Preparations for gcc-3.3.x. + * wrapup/Makefile.am: Misc cleanups and fixes. + 2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am index b599536f30..7f40c391f5 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = . dlentry flashentry startup @exceptions@ wrapup include $(top_srcdir)/../../bsp.am -dist_bsplib_DATA += bsp_specs.dl +dist_project_lib_DATA = bsp_specs.dl include_HEADERS += include/coverhd.h @@ -18,6 +18,8 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times +TMPINSTALL_FILES = + $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h diff --git a/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am index a52f1ccb58..2c33a3ead5 100644 --- a/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/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/helas403/startup/linkcmds b/c/src/lib/libbsp/powerpc/helas403/startup/linkcmds index c4d91dfc59..a56fbc8ddd 100644 --- a/c/src/lib/libbsp/powerpc/helas403/startup/linkcmds +++ b/c/src/lib/libbsp/powerpc/helas403/startup/linkcmds @@ -101,7 +101,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/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am index d38e12726f..7bb3b94afe 100644 --- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am @@ -7,9 +7,8 @@ BSP_PIECES = startup dlentry flashentry CPU_PIECES = clock timer console 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)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a |