summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-07-21 16:45:00 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-07-21 16:45:00 +0000
commita36f4a85a6946168cb2add98eca588712b937d4e (patch)
tree61a103d7cfd4f046bd9847ac34a7f5e980078225
parent4375911b18ccb616339ae0b194449f92f7c053af (diff)
downloadrtems-a36f4a85a6946168cb2add98eca588712b937d4e.tar.bz2
2002-07-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems.S: Remove. * Makefile.am: Reflect having removed rtems.S. Use AM_CPPFLAGS instead of INCLUDES (Latest automake standard).
-rw-r--r--c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog6
-rw-r--r--c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am10
-rw-r--r--c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems.S131
-rw-r--r--c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog6
4 files changed, 14 insertions, 139 deletions
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog b/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog
index 3b7ffcae80..95b47f3950 100644
--- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * rtems.S: Remove.
+ * Makefile.am: Reflect having removed rtems.S. Use AM_CPPFLAGS
+ instead of INCLUDES (Latest automake standard).
+
2002-04-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* cpu.c: Include <rtems/powerpc/cache.h>.
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
index d0dec96997..1d8a1406e8 100644
--- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
@@ -2,11 +2,8 @@
## $Id$
##
-
ACLOCAL_AMFLAGS = -I ../../../../../../../aclocal
-INCLUDES = -I$(srcdir)
-
# C source names
C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
@@ -22,14 +19,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../../automake/compile.am
include $(top_srcdir)/../../../../../../../automake/lib.am
+AM_CPPFLAGS += -I$(srcdir)
+
TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
$(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
- $(INSTALL_DATA) $< $@
-
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems.S b/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems.S
deleted file mode 100644
index 7225bddae6..0000000000
--- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems.S
+++ /dev/null
@@ -1,131 +0,0 @@
-/* rtems.s
- *
- * This file contains the single entry point code for
- * the PowerPC implementation of RTEMS.
- *
- * Author: Andrew Bray <andy@i-cubed.co.uk>
- *
- * COPYRIGHT (c) 1995 by i-cubed ltd.
- *
- * To anyone who acknowledges that this file is provided "AS IS"
- * without any express or implied warranty:
- * permission to use, copy, modify, and distribute this file
- * for any purpose is hereby granted without fee, provided that
- * the above copyright notice and this notice appears in all
- * copies, and that the name of i-cubed limited not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * i-cubed limited makes no representations about the suitability
- * of this software for any purpose.
- *
- * Derived from c/src/exec/cpu/no_cpu/rtems.c:
- *
- * COPYRIGHT (c) 1989-1997.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may in
- * the file LICENSE in this distribution or at
- * http://www.OARcorp.com/rtems/license.html.
- *
- * $Id$
- */
-
-#include <asm.h>
-
- BEGIN_CODE
-/*
- * RTEMS
- *
- * This routine jumps to the directive indicated in r11.
- * This routine is used when RTEMS is linked by itself and placed
- * in ROM. This routine is the first address in the ROM space for
- * RTEMS. The user "calls" this address with the directive arguments
- * in the normal place.
- * This routine then jumps indirectly to the correct directive
- * preserving the arguments. The directive should not realize
- * it has been "wrapped" in this way. The table "_Entry_points"
- * is used to look up the directive.
- */
-
- ALIGN (4, 2)
- PUBLIC_PROC (RTEMS)
-PROC (RTEMS):
-#if (PPC_ABI == PPC_ABI_POWEROPEN)
- mflr r0
- stw r0, 8(r1)
- stwu r1, -64(r1)
-
- /* Establish addressing */
- bl base
-base:
- mflr r12
- addi r12, r12, tabaddr - base
-
- lwz r12, Entry_points-abase(r12)
- slwi r11, r11, 2
- lwzx r12, r12, r11
-
- stw r2, 56(r1)
- lwz r0, 0(r12)
- mtlr r0
- lwz r2, 4(r12)
- lwz r11, 8(r12)
- blrl
- lwz r2, 56(r1)
- addi r1, r1, 64
- lwz r0, 8(r1)
- mtlr r0
-#else
- mflr r0
- stw r0, 4(r1)
- stwu r1, -16(r1)
-
- /* Establish addressing */
- bl base
-base:
- mflr r12
- addi r12, r12, tabaddr - base
-
- lwz r12, Entry_points-abase(r12)
- slwi r11, r11, 2
- lwzx r11, r12, r11
-
- stw r2, 8(r1)
-#if (PPC_ABI != PPC_ABI_GCC27)
- stw r13, 12(r1)
-#endif
- mtlr r11
- lwz r11, irqinfo-abase(r12)
- lwz r2, 0(r11)
-#if (PPC_ABI != PPC_ABI_GCC27)
- lwz r13, 4(r11)
-#endif
- blrl
- lwz r2, 8(r1)
-#if (PPC_ABI != PPC_ABI_GCC27)
- lwz r13, 12(r1)
-#endif
- addi r1, r1, 16
- lwz r0, 4(r1)
- mtlr r0
-#endif
- blr
-
-
- /* Addressability stuff */
-tabaddr:
-abase:
- EXTERN_VAR (_Entry_points)
-Entry_points:
- EXT_SYM_REF (_Entry_points)
-#if (PPC_ABI != PPC_ABI_POWEROPEN)
- EXTERN_VAR (_CPU_IRQ_info)
-irqinfo:
- EXT_SYM_REF (_CPU_IRQ_info)
-#endif
-
-#if (PPC_ABI == PPC_ABI_POWEROPEN)
- DESCRIPTOR (RTEMS)
-#endif
-
-
diff --git a/c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog b/c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog
index 3b7ffcae80..95b47f3950 100644
--- a/c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/old-exceptions/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * rtems.S: Remove.
+ * Makefile.am: Reflect having removed rtems.S. Use AM_CPPFLAGS
+ instead of INCLUDES (Latest automake standard).
+
2002-04-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* cpu.c: Include <rtems/powerpc/cache.h>.