From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am  |  4 ++--
 .../powerpc/motorola_powerpc/bootloader/Makefile.am    | 18 +++++++++---------
 c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs    |  2 +-
 .../libbsp/powerpc/motorola_powerpc/clock/Makefile.am  |  4 ++--
 .../powerpc/motorola_powerpc/console/Makefile.am       |  4 ++--
 .../powerpc/motorola_powerpc/include/Makefile.am       |  4 ++--
 .../libbsp/powerpc/motorola_powerpc/irq/Makefile.am    |  4 ++--
 .../powerpc/motorola_powerpc/motorola/Makefile.am      |  4 ++--
 .../powerpc/motorola_powerpc/openpic/Makefile.am       |  4 ++--
 .../libbsp/powerpc/motorola_powerpc/pci/Makefile.am    |  6 ++++--
 .../powerpc/motorola_powerpc/residual/Makefile.am      |  4 ++--
 .../libbsp/powerpc/motorola_powerpc/start/Makefile.am  |  4 ++--
 .../powerpc/motorola_powerpc/startup/Makefile.am       |  9 ++++-----
 .../powerpc/motorola_powerpc/vectors/Makefile.am       |  4 ++--
 .../libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am |  4 ++--
 15 files changed, 40 insertions(+), 39 deletions(-)

(limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc')

diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 705daffa04..63b6c40c9a 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
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 8e43957699..398dee820e 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -23,12 +23,12 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -D__BOOT__ -DDEBUG
-AM_CFLAGS += -msoft-float -mstrict-align -fno-builtin -Wall -mmultiple \
-    -mstring -O2 -fomit-frame-pointer -mrelocatable -ffixed-r13 -mno-sdata \
-    -D__BOOT__ -DDEBUG
+## FIXME:
+## ASFLAGS = -mrelocatable
+CFLAGS_DEBUG_V = $(CFLAGS_OPTIMIZE_V)
 
-ASFLAGS += -mrelocatable
+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
 
 IMAGES = rtems.gz
 
@@ -47,7 +47,7 @@ DISTCLEANFILES += $(IMAGES)
 bootloader : $(OBJS) $(IMAGES) $(BINARY_LOADED) ppcboot.lds
 	$(LD) -o bootloader $(OBJS) --just-symbols=$(BINARY_LOADED) \
 	-b binary $(IMAGES) -T @srcdir@/../../shared/bootloader/ppcboot.lds \
-	-Map bootloader.map
+	-Map $(ARCH)/bootloader.map
 
 check_unresolved : $(OBJS)
 	$(LD) -r -o reloc.O $(OBJS)
@@ -55,7 +55,7 @@ check_unresolved : $(OBJS)
 	echo "Every symbol listed should be defined in @srcdir@/ppcboot.lds"
 
 rtems: $(BINARY_LOADED)
-	$(OBJCOPY)  $(BINARY_LOADED) rtems -O binary -R .comment -S 
+	$(OBJCOPY)  $(BINARY_LOADED) rtems -O binary -R .comment -S
 
 rtems.gz: rtems
 	gzip -vf9 rtems
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs b/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
index 394b4363dd..16296016c0 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
@@ -19,5 +19,5 @@
 %{qrtems_debug: start_g.o%s}}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -T linkcmds%s -e __rtems_entry_point -u __vectors}
+%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -e __rtems_entry_point -u __vectors}
 
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 979bf52f1b..1206b032bb 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
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 202b2eaa8b..360e36037d 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
index a6ee837cdc..980401fd37 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
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 44fe052a2e..da96801117 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
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 59e52de5c3..bd50126c27 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
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 be3141a744..03ed4ac63c 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
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 32d9e7e96d..9334f0ffb2 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -20,6 +20,8 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
+AM_CFLAGS = -O2
+
 $(PROJECT_INCLUDE)/bsp:
 	$(mkinstalldirs) $<
 
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 add4fd61a8..d5382769d6 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
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 af4903eb54..f0c6e6180f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
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 ca1c49cea2..c1ca73b2f5 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
@@ -1,11 +1,10 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-VPATH = \
-    @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
+VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
 
 C_FILES = bootcard.c main.c bspstart.c bsppost.c bsplibc.c sbrk.c bspclean.c \
     gnatinstallhandler.c
@@ -24,7 +23,7 @@ $(PROJECT_RELEASE)/lib/linkcmds: linkcmds
 	$(INSTALL_DATA) $< $@
 
 # FIXME: This should not be here
-# $(PROJECT_RELEASE)/lib/libbsp.a: 
+# $(PROJECT_RELEASE)/lib/libbsp.a:
 #	cd ../wrapup; $(MAKE) $(AM_MAKEFLAGS)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
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 42bc5d4533..5d158dbe4f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
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 88c149b8a8..7f45a1d1b7 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-- 
cgit v1.2.3