sparc: Move libcpu content to cpukit

This patch is a part of the BSP source reorganization.

Update #3285.

21 files changed, 9 insertions, 81 deletions

diff --git a/bsps/sparc/headers.am b/bsps/sparc/headers.am
index c561e0c06f..5b4236e1b1 100644
--- a/bsps/sparc/headers.am
+++ b/bsps/sparc/headers.am
@@ -69,7 +69,3 @@ include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus.h
 include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
 include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/bspcommon.h
 include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/leon2_amba_bus.h
-
-include_libcpudir = $(includedir)/libcpu
-include_libcpu_HEADERS =
-include_libcpu_HEADERS += ../../../../../bsps/sparc/include/libcpu/access.h
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 52017ba0d6..1cfc273c21 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -78,11 +78,6 @@ endif
 
 libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-libbsp_a_LIBADD  = \
-    ../../../libcpu/@RTEMS_CPU@/access.rel \
-    ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
-    ../../../libcpu/@RTEMS_CPU@/syscall.rel
-
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg b/c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg
index 28593726a7..84cc752daf 100644
--- a/c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg
+++ b/c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-RTEMS_CPU_MODEL=erc32
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index f2d7e56a4f..24cfa7b853 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -176,11 +176,6 @@ libbsp_a_SOURCES += ../../sparc/shared/net/greth.c
 libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 endif
 
-libbsp_a_LIBADD = \
-    ../../../libcpu/@RTEMS_CPU@/access.rel \
-    ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
-    ../../../libcpu/@RTEMS_CPU@/syscall.rel
-
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/leon2/make/custom/at697f.cfg b/c/src/lib/libbsp/sparc/leon2/make/custom/at697f.cfg
index 3facbbee81..94ab6efbe9 100644
--- a/c/src/lib/libbsp/sparc/leon2/make/custom/at697f.cfg
+++ b/c/src/lib/libbsp/sparc/leon2/make/custom/at697f.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-RTEMS_CPU_MODEL=leon2
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg b/c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg
index 4db836ea3b..a5e76e7aa9 100644
--- a/c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg
+++ b/c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-RTEMS_CPU_MODEL=leon2
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 614a5d5d26..ebceda15e1 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -202,11 +202,6 @@ libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
     shmsupp/mpisr.c
 endif
 
-libbsp_a_LIBADD = \
-    ../../../libcpu/@RTEMS_CPU@/access.rel \
-    ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
-    ../../../libcpu/@RTEMS_CPU@/syscall.rel
-
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/gr712rc.cfg b/c/src/lib/libbsp/sparc/leon3/make/custom/gr712rc.cfg
index 40c6d12524..897dd0142f 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/gr712rc.cfg
+++ b/c/src/lib/libbsp/sparc/leon3/make/custom/gr712rc.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-RTEMS_CPU_MODEL=leon3
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg b/c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg
index ef9a86851a..d931d6c5f1 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg
+++ b/c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-RTEMS_CPU_MODEL=leon3
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/ut699.cfg b/c/src/lib/libbsp/sparc/leon3/make/custom/ut699.cfg
index 2150428a3d..a8fff49b3a 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/ut699.cfg
+++ b/c/src/lib/libbsp/sparc/leon3/make/custom/ut699.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-RTEMS_CPU_MODEL=leon3
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sparc/leon3/make/custom/ut700.cfg b/c/src/lib/libbsp/sparc/leon3/make/custom/ut700.cfg
index 9ee473eed2..bcca9010ed 100644
--- a/c/src/lib/libbsp/sparc/leon3/make/custom/ut700.cfg
+++ b/c/src/lib/libbsp/sparc/leon3/make/custom/ut700.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-RTEMS_CPU_MODEL=leon3
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am
deleted file mode 100644
index 95e473d622..0000000000
--- a/c/src/lib/libcpu/sparc/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
-include $(top_srcdir)/../../../automake/compile.am
-
-noinst_PROGRAMS =
-
-noinst_PROGRAMS += syscall.rel
-syscall_rel_SOURCES = syscall/syscall.S syscall/syscall.h
-syscall_rel_CPPFLAGS = $(AM_CPPFLAGS)
-syscall_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += reg_win.rel
-reg_win_rel_SOURCES = reg_win/window.S
-reg_win_rel_CPPFLAGS = $(AM_CPPFLAGS)
-reg_win_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += access.rel
-access_rel_SOURCES = access/access.S access/access_le.c
-access_rel_CPPFLAGS = $(AM_CPPFLAGS)
-access_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/configure.ac b/c/src/lib/libcpu/sparc/configure.ac
deleted file mode 100644
index 7107f971a9..0000000000
--- a/c/src/lib/libcpu/sparc/configure.ac
+++ /dev/null
@@ -1,29 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([rtems-c-src-lib-libcpu-sparc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
-AC_CONFIG_SRCDIR([reg_win])
-RTEMS_TOP([../../../../..],[../../..])
-RTEMS_SOURCE_TOP
-RTEMS_BUILD_TOP
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSBSP
-
-RTEMS_PROJECT_ROOT
-
-RTEMS_PROG_CC_FOR_TARGET
-AM_PROG_CC_C_O
-RTEMS_CANONICALIZE_TOOLS
-RTEMS_PROG_CCAS
-
-RTEMS_AMPOLISH3
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index 1a76a2f009..817cc11741 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -1,12 +1,16 @@
 include $(top_srcdir)/automake/compile.am
 
 noinst_LIBRARIES = libscorecpu.a
-libscorecpu_a_SOURCES = cpu.c
-libscorecpu_a_SOURCES += sparc-context-volatile-clobber.S
+libscorecpu_a_SOURCES =
+libscorecpu_a_SOURCES += access_le.c
+libscorecpu_a_SOURCES += access.S
+libscorecpu_a_SOURCES += cpu.c
 libscorecpu_a_SOURCES += sparc-context-validate.S
-libscorecpu_a_SOURCES += sparc-counter.c
+libscorecpu_a_SOURCES += sparc-context-volatile-clobber.S
 libscorecpu_a_SOURCES += sparc-counter-asm.S
-libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
+libscorecpu_a_SOURCES += sparc-counter.c
+libscorecpu_a_SOURCES += syscall.S
+libscorecpu_a_SOURCES += window.S
 
 include $(top_srcdir)/automake/local.am
 include $(srcdir)/headers.am
diff --git a/c/src/lib/libcpu/sparc/access/access.S b/cpukit/score/cpu/sparc/access.S
index 9397cb815b..9397cb815b 100644
--- a/c/src/lib/libcpu/sparc/access/access.S
+++ b/cpukit/score/cpu/sparc/access.S
diff --git a/c/src/lib/libcpu/sparc/access/access_le.c b/cpukit/score/cpu/sparc/access_le.c
index d3a0e93adb..d3a0e93adb 100644
--- a/c/src/lib/libcpu/sparc/access/access_le.c
+++ b/cpukit/score/cpu/sparc/access_le.c
diff --git a/cpukit/score/cpu/sparc/headers.am b/cpukit/score/cpu/sparc/headers.am
index 0e1aea959b..f0c179c827 100644
--- a/cpukit/score/cpu/sparc/headers.am
+++ b/cpukit/score/cpu/sparc/headers.am
@@ -2,6 +2,7 @@
 
 include_libcpudir = $(includedir)/libcpu
 include_libcpu_HEADERS =
+include_libcpu_HEADERS += include/libcpu/access.h
 include_libcpu_HEADERS += include/libcpu/byteorder.h
 
 include_machinedir = $(includedir)/machine
diff --git a/bsps/sparc/include/libcpu/access.h b/cpukit/score/cpu/sparc/include/libcpu/access.h
index cdf6b77122..cdf6b77122 100644
--- a/bsps/sparc/include/libcpu/access.h
+++ b/cpukit/score/cpu/sparc/include/libcpu/access.h
diff --git a/c/src/lib/libcpu/sparc/syscall/syscall.S b/cpukit/score/cpu/sparc/syscall.S
index da0ee43889..da0ee43889 100644
--- a/c/src/lib/libcpu/sparc/syscall/syscall.S
+++ b/cpukit/score/cpu/sparc/syscall.S
diff --git a/c/src/lib/libcpu/sparc/syscall/syscall.h b/cpukit/score/cpu/sparc/syscall.h
index 2f20886840..2f20886840 100644
--- a/c/src/lib/libcpu/sparc/syscall/syscall.h
+++ b/cpukit/score/cpu/sparc/syscall.h
diff --git a/c/src/lib/libcpu/sparc/reg_win/window.S b/cpukit/score/cpu/sparc/window.S
index 5a36fd65be..5a36fd65be 100644
--- a/c/src/lib/libcpu/sparc/reg_win/window.S
+++ b/cpukit/score/cpu/sparc/window.S