From 2f91de2da973ce46a8718821f8ca5e7cd7dc57cd Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 8 Dec 2017 14:07:05 +0100 Subject: bsps/sh: Delete libcpu/sh --- c/src/lib/libbsp/sh/gensh1/Makefile.am | 5 ++++- c/src/lib/libbsp/sh/gensh2/Makefile.am | 5 ++++- c/src/lib/libbsp/sh/gensh4/Makefile.am | 5 ++++- c/src/lib/libbsp/sh/shsim/Makefile.am | 5 ++++- c/src/lib/libcpu/sh/Makefile.am | 13 ------------- c/src/lib/libcpu/sh/cache/cache_.h | 5 ----- c/src/lib/libcpu/sh/configure.ac | 27 --------------------------- c/src/lib/libcpu/sh/preinstall.am | 7 ------- 8 files changed, 16 insertions(+), 56 deletions(-) delete mode 100644 c/src/lib/libcpu/sh/Makefile.am delete mode 100644 c/src/lib/libcpu/sh/cache/cache_.h delete mode 100644 c/src/lib/libcpu/sh/configure.ac delete mode 100644 c/src/lib/libcpu/sh/preinstall.am diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 61feddc449..c7a826ffc9 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -59,7 +59,10 @@ libbsp_a_SOURCES += console/sci.c # debugio libbsp_a_SOURCES += ../../shared/dummy_printk_support.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel +# Cache +libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c +libbsp_a_SOURCES += ../../shared/include/cache_.h +libbsp_a_CPPFLAGS = -I$(srcdir)/../../shared/include EXTRA_DIST = times diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 2ca4e76b05..b42e394b13 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -64,7 +64,10 @@ libbsp_a_SOURCES += console/sci_termios.c # debugio libbsp_a_SOURCES += ../../shared/dummy_printk_support.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel +# Cache +libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c +libbsp_a_SOURCES += ../../shared/include/cache_.h +libbsp_a_CPPFLAGS = -I$(srcdir)/../../shared/include include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 4897d32a3f..50e8153e9f 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -52,7 +52,10 @@ libbsp_a_SOURCES += console/sh4uart.c # hw_init libbsp_a_SOURCES += hw_init/hw_init.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel +# Cache +libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c +libbsp_a_SOURCES += ../../shared/include/cache_.h +libbsp_a_CPPFLAGS = -I$(srcdir)/../../shared/include EXTRA_DIST = times diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index e49e4f4b5f..53097aff0d 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -53,7 +53,10 @@ libbsp_a_SOURCES += console/console-debugio.c # timer libbsp_a_SOURCES += ../../shared/timerstub.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel +# Cache +libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c +libbsp_a_SOURCES += ../../shared/include/cache_.h +libbsp_a_CPPFLAGS = -I$(srcdir)/../../shared/include include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am deleted file mode 100644 index c39db6ea53..0000000000 --- a/c/src/lib/libcpu/sh/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -ACLOCAL_AMFLAGS = -I ../../../aclocal - -include $(top_srcdir)/../../../automake/compile.am - -noinst_PROGRAMS = - -noinst_PROGRAMS += cache.rel -cache_rel_SOURCES = ../shared/src/cache_manager.c -cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache -cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -include $(srcdir)/preinstall.am -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/cache/cache_.h b/c/src/lib/libcpu/sh/cache/cache_.h deleted file mode 100644 index 12ff05eaeb..0000000000 --- a/c/src/lib/libcpu/sh/cache/cache_.h +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @file - * - * Empty cache support file for SuperH. - */ diff --git a/c/src/lib/libcpu/sh/configure.ac b/c/src/lib/libcpu/sh/configure.ac deleted file mode 100644 index 43d10f454d..0000000000 --- a/c/src/lib/libcpu/sh/configure.ac +++ /dev/null @@ -1,27 +0,0 @@ -## Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.69]) -AC_INIT([rtems-c-src-lib-libcpu-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) -AC_CONFIG_SRCDIR([cache]) -RTEMS_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/c/src/lib/libcpu/sh/preinstall.am b/c/src/lib/libcpu/sh/preinstall.am deleted file mode 100644 index dba6cc4d81..0000000000 --- a/c/src/lib/libcpu/sh/preinstall.am +++ /dev/null @@ -1,7 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -- cgit v1.2.3