bsps: Move shmdr to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

19 files changed, 18 insertions, 23 deletions

diff --git a/bsps/shared/shared-sources.am b/bsps/shared/shared-sources.am
index d3503ddc01..134a143ae3 100644
--- a/bsps/shared/shared-sources.am
+++ b/bsps/shared/shared-sources.am
@@ -51,3 +51,19 @@ libbsp_a_SOURCES += ../../../../../../bsps/shared/net/smc91111.c
 libbsp_a_SOURCES += ../../../../../../bsps/shared/net/sonic.c
 endif
 libbsp_a_SOURCES += ../../../../../../bsps/shared/rtems-version.c
+if HAS_MP
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-addlq.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-cnvpkt.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-dump.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-fatal.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-getlq.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-getpkt.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-init.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-initlq.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-intr.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-poll.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-receive.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-retpkt.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-send.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/shmdr/shmdr-shmisr.c
+endif
diff --git a/c/src/libchip/shmdr/README b/bsps/shared/shmdr/README
index ac28f05bc3..ac28f05bc3 100644
--- a/c/src/libchip/shmdr/README
+++ b/bsps/shared/shmdr/README
diff --git a/c/src/libchip/shmdr/addlq.c b/bsps/shared/shmdr/shmdr-addlq.c
index 23e986753d..23e986753d 100644
--- a/c/src/libchip/shmdr/addlq.c
+++ b/bsps/shared/shmdr/shmdr-addlq.c
diff --git a/c/src/libchip/shmdr/cnvpkt.c b/bsps/shared/shmdr/shmdr-cnvpkt.c
index 38e7819c60..38e7819c60 100644
--- a/c/src/libchip/shmdr/cnvpkt.c
+++ b/bsps/shared/shmdr/shmdr-cnvpkt.c
diff --git a/c/src/libchip/shmdr/dump.c b/bsps/shared/shmdr/shmdr-dump.c
index f1be932467..f1be932467 100644
--- a/c/src/libchip/shmdr/dump.c
+++ b/bsps/shared/shmdr/shmdr-dump.c
diff --git a/c/src/libchip/shmdr/fatal.c b/bsps/shared/shmdr/shmdr-fatal.c
index ad3f18a5a6..ad3f18a5a6 100644
--- a/c/src/libchip/shmdr/fatal.c
+++ b/bsps/shared/shmdr/shmdr-fatal.c
diff --git a/c/src/libchip/shmdr/getlq.c b/bsps/shared/shmdr/shmdr-getlq.c
index afb288b793..afb288b793 100644
--- a/c/src/libchip/shmdr/getlq.c
+++ b/bsps/shared/shmdr/shmdr-getlq.c
diff --git a/c/src/libchip/shmdr/getpkt.c b/bsps/shared/shmdr/shmdr-getpkt.c
index 454a551597..454a551597 100644
--- a/c/src/libchip/shmdr/getpkt.c
+++ b/bsps/shared/shmdr/shmdr-getpkt.c
diff --git a/c/src/libchip/shmdr/init.c b/bsps/shared/shmdr/shmdr-init.c
index 0cf51172ce..0cf51172ce 100644
--- a/c/src/libchip/shmdr/init.c
+++ b/bsps/shared/shmdr/shmdr-init.c
diff --git a/c/src/libchip/shmdr/initlq.c b/bsps/shared/shmdr/shmdr-initlq.c
index 6d03f61109..6d03f61109 100644
--- a/c/src/libchip/shmdr/initlq.c
+++ b/bsps/shared/shmdr/shmdr-initlq.c
diff --git a/c/src/libchip/shmdr/intr.c b/bsps/shared/shmdr/shmdr-intr.c
index 48e0d7ac21..48e0d7ac21 100644
--- a/c/src/libchip/shmdr/intr.c
+++ b/bsps/shared/shmdr/shmdr-intr.c
diff --git a/c/src/libchip/shmdr/mpisr.c b/bsps/shared/shmdr/shmdr-mpisr.c
index 38449b7450..38449b7450 100644
--- a/c/src/libchip/shmdr/mpisr.c
+++ b/bsps/shared/shmdr/shmdr-mpisr.c
diff --git a/c/src/libchip/shmdr/poll.c b/bsps/shared/shmdr/shmdr-poll.c
index 39eab7d352..39eab7d352 100644
--- a/c/src/libchip/shmdr/poll.c
+++ b/bsps/shared/shmdr/shmdr-poll.c
diff --git a/c/src/libchip/shmdr/receive.c b/bsps/shared/shmdr/shmdr-receive.c
index 5cf7692f01..5cf7692f01 100644
--- a/c/src/libchip/shmdr/receive.c
+++ b/bsps/shared/shmdr/shmdr-receive.c
diff --git a/c/src/libchip/shmdr/retpkt.c b/bsps/shared/shmdr/shmdr-retpkt.c
index 04d0789dc5..04d0789dc5 100644
--- a/c/src/libchip/shmdr/retpkt.c
+++ b/bsps/shared/shmdr/shmdr-retpkt.c
diff --git a/c/src/libchip/shmdr/send.c b/bsps/shared/shmdr/shmdr-send.c
index c3ac7d51c2..c3ac7d51c2 100644
--- a/c/src/libchip/shmdr/send.c
+++ b/bsps/shared/shmdr/shmdr-send.c
diff --git a/c/src/configure.ac b/c/src/configure.ac
index a39b4ec08d..170abc4479 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 AC_INIT([rtems-c-src],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
-AC_CONFIG_SRCDIR([libchip])
+AC_CONFIG_SRCDIR([lib])
 RTEMS_TOP(../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
@@ -110,7 +110,7 @@ RTEMS_CHECK_GCC_WEAK
 
 AC_SUBST(CUSTOM_CFG_FILES)
 
-RTEMS_CHECK_MULTIPROCESSING
+RTEMS_ENABLE_MULTILIB
 
 BSP_SUBDIRS=
 ## Configure ${srcdir}/../../cpukit as cpukit/ if multilibs are disabled
@@ -131,7 +131,6 @@ RTEMS_CPU_SUBDIRS([lib/libbsp])
 AC_SUBST(libbsp_cpu_subdir,$RTEMS_CPU)
 
 BSP_SUBDIRS="$BSP_SUBDIRS lib/libbsp"
-BSP_SUBDIRS="$BSP_SUBDIRS libchip"
 BSP_SUBDIRS="$BSP_SUBDIRS wrapup"
 
 # Build testsuites
@@ -162,7 +161,6 @@ AC_CONFIG_FILES([Makefile],
  MAKE=${MAKE}])
 
 AC_CONFIG_FILES([
-libchip/Makefile
 lib/libbsp/Makefile
 wrapup/Makefile
 ])
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
deleted file mode 100644
index 74c83f14c8..0000000000
--- a/c/src/libchip/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-
-## shmdr
-if HAS_MP
-noinst_LIBRARIES = libshmdr.a
-libshmdr_a_CPPFLAGS = $(AM_CPPFLAGS)
-libshmdr_a_SOURCES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \
-    shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \
-    shmdr/mpisr.c shmdr/poll.c shmdr/receive.c shmdr/retpkt.c shmdr/send.c
-endif
-
-
-## --
-
-include $(top_srcdir)/automake/local.am
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index fed257c8aa..5782020706 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -15,10 +15,6 @@ CLEANFILES = o-optimize/librtemsbsp.a
 
 SRCS = ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a
 
-if HAS_MP
-SRCS += ../libchip/libshmdr.a
-endif
-
 o-optimize/librtemsbsp.a: $(SRCS)
 	rm -f $@
 	$(MKDIR_P) o-optimize