[rtems commit] sparc: Move irq_asm.S

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    c49896f1c0f16fd8ef7983ecc47f86e2f32dd6e6
Changeset: http://git.rtems.org/rtems/commit/?id=c49896f1c0f16fd8ef7983ecc47f86e2f32dd6e6

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Apr 20 13:22:29 2018 +0200

sparc: Move irq_asm.S

This file is BSP-independent.

This patch is a part of the BSP source reorganization.

Update #3285.

---

 c/src/lib/libbsp/sparc/erc32/Makefile.am                                | 2 --
 c/src/lib/libbsp/sparc/leon2/Makefile.am                                | 2 --
 c/src/lib/libbsp/sparc/leon3/Makefile.am                                | 2 --
 cpukit/score/cpu/sparc/Makefile.am                                      | 1 +
 .../libbsp/sparc/shared/irq_asm.S => cpukit/score/cpu/sparc/cpu_asm.S   | 1 -
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 63df570..d093307 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -34,8 +34,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/bspidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/bspdelay.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_exit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_halt.c
-# ISR Handler
-librtemsbsp_a_SOURCES += ../shared/irq_asm.S
 # gnatsupp
 librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
 librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 9930a1a..5a6d149 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -35,8 +35,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/bspdelay.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_exit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_halt.c
 
-# ISR Handler
-librtemsbsp_a_SOURCES += ../shared/irq_asm.S
 # gnatsupp
 librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
 librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index a08944b..994a1d9 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -39,8 +39,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_exit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/bsp_fatal_halt.c
 
-# ISR Handler
-librtemsbsp_a_SOURCES += ../shared/irq_asm.S
 # gnatsupp
 librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
 librtemsbsp_a_SOURCES += ../shared/gnatcommon.c
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index 817cc11..0f77880 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -5,6 +5,7 @@ libscorecpu_a_SOURCES =
 libscorecpu_a_SOURCES += access_le.c
 libscorecpu_a_SOURCES += access.S
 libscorecpu_a_SOURCES += cpu.c
+libscorecpu_a_SOURCES += cpu_asm.S
 libscorecpu_a_SOURCES += sparc-context-validate.S
 libscorecpu_a_SOURCES += sparc-context-volatile-clobber.S
 libscorecpu_a_SOURCES += sparc-counter-asm.S
diff --git a/c/src/lib/libbsp/sparc/shared/irq_asm.S b/cpukit/score/cpu/sparc/cpu_asm.S
similarity index 99%
rename from c/src/lib/libbsp/sparc/shared/irq_asm.S
rename to cpukit/score/cpu/sparc/cpu_asm.S
index 7d0312b..2f3ad24 100644
--- a/c/src/lib/libbsp/sparc/shared/irq_asm.S
+++ b/cpukit/score/cpu/sparc/cpu_asm.S
@@ -23,7 +23,6 @@
 
 #include <rtems/asm.h>
 #include <rtems/score/percpu.h>
-#include <bspopts.h>
 
 #if defined(SPARC_USE_SYNCHRONOUS_FP_SWITCH)
   #define FP_FRAME_OFFSET_FO_F1 (SPARC_MINIMUM_STACK_FRAME_SIZE + 0)