From 23bdd25eef21040009b8384e23f9ff2128aedcdd Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 15 Nov 2000 21:35:01 +0000 Subject: 2000-11-14 Jiri Gaisler * wrapup/Makefile.am: Pick up cache code from libcpu and pick up .o's instead of .rel's from libcpu. --- c/src/lib/libbsp/sparc/erc32/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/sparc/leon/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index 6553bf6847..4a9da69770 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog @@ -1,3 +1,8 @@ +2000-11-14 Jiri Gaisler + + * wrapup/Makefile.am: Pick up cache code from libcpu and pick + up .o's instead of .rel's from libcpu. + 2000-11-13 Jiri Gaisler * Makefile.am, configure.in, gnatsupp/Makefile.am, diff --git a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am index fa36d7786c..177f2124da 100644 --- a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am @@ -11,11 +11,11 @@ endif BSP_PIECES = startup console clock timer gnatsupp $(NETWORKING_DRIVER) # pieces to pick up out of libcpu/sparc -CPU_PIECES = reg_win syscall +CPU_PIECES = cache reg_win syscall # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) + $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog index 055626b1cb..da7b542402 100644 --- a/c/src/lib/libbsp/sparc/leon/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon/ChangeLog @@ -1,3 +1,8 @@ +2000-11-14 Jiri Gaisler + + * wrapup/Makefile.am: Pick up cache code from libcpu and pick + up .o's instead of .rel's from libcpu. + 2000-11-14 Jiri Gaisler * startup/boardinit.S: St 32-bit ram width by default. diff --git a/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am index 56ffe742f3..bf82dfb0a2 100644 --- a/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am @@ -10,11 +10,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 BSP_PIECES = startup console clock timer gnatsupp $(NETWORK) # pieces to pick up out of libcpu/sparc -CPU_PIECES = reg_win syscall +CPU_PIECES = cache reg_win syscall # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) + $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -- cgit v1.2.3