From c04ddbf6d8adfe0d44cafebb2f3b48663c66b909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= <josef.soentgen@genode-labs.com>
Date: Wed, 30 Apr 2014 15:17:50 +0200
Subject: [PATCH] dde_rump: move memcpy() to rump lib

On ARM in one way or another 'string.h' prototypes will be used. Move
the definitions from rump_fs to the rump library because it is needed
by all rump based servers running on ARM.

Issue #1141.
---
 repos/dde_rump/lib/mk/rump_base.inc           |  2 +-
 repos/dde_rump/src/lib/rump/misc.cc           | 30 +++++++++++++++++++
 .../src/server/rump_fs/file_system.cc         | 15 ----------
 3 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 repos/dde_rump/src/lib/rump/misc.cc

diff --git a/repos/dde_rump/lib/mk/rump_base.inc b/repos/dde_rump/lib/mk/rump_base.inc
index f51830ed9..f5df99fcc 100644
--- a/repos/dde_rump/lib/mk/rump_base.inc
+++ b/repos/dde_rump/lib/mk/rump_base.inc
@@ -15,7 +15,7 @@ VERBOSE_LEVEL ?= 0
 #
 # Sources
 #
-SRC_CC = dummies.cc hypercall.cc bootstrap.cc io.cc sync.cc
+SRC_CC = dummies.cc hypercall.cc bootstrap.cc io.cc sync.cc misc.cc
 
 #
 # TARGET to trigger rump build
diff --git a/repos/dde_rump/src/lib/rump/misc.cc b/repos/dde_rump/src/lib/rump/misc.cc
new file mode 100644
index 000000000..ecf6ccade
--- /dev/null
+++ b/repos/dde_rump/src/lib/rump/misc.cc
@@ -0,0 +1,30 @@
+/**
+ * \brief  Misc functions
+ * \author Sebastian Sumpf
+ * \date   2014-01-17
+ */
+
+/*
+ * Copyright (C) 2014 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
+/* Genode includes */
+#include <util/string.h>
+
+
+/*
+ * On some platforms (namely ARM) we end-up pulling in string.h prototypes
+ */
+extern "C" void *memcpy(void *d, void *s, Genode::size_t n)
+{
+	return Genode::memcpy(d, s, n);
+}
+
+
+extern "C" void *memset(void *s, int c, Genode::size_t n)
+{
+	return Genode::memset(s, c, n);
+}
diff --git a/repos/dde_rump/src/server/rump_fs/file_system.cc b/repos/dde_rump/src/server/rump_fs/file_system.cc
index 89e7f8233..6b5d132c2 100644
--- a/repos/dde_rump/src/server/rump_fs/file_system.cc
+++ b/repos/dde_rump/src/server/rump_fs/file_system.cc
@@ -154,18 +154,3 @@ void File_system::init(Server::Entrypoint &ep)
 
 
 bool File_system::supports_symlinks() { return _supports_symlinks; }
-
-
-/*
- * On some platforms we end-up pulling in string.h prototypes
- */
-extern "C" void *memcpy(void *d, void *s, size_t n)
-{
-	return Genode::memcpy(d, s, n);
-}
-
-
-extern "C" void *memset(void *s, int c, size_t n)
-{
-	return Genode::memset(s, c, n);
-}