WIP-glibc-override
put the -ldl in the compiler's default ldflags.
diff --git a/tests/Makefile b/tests/Makefile
index b8c4095..8577082 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -8,7 +8,7 @@
CFLAGS_TESTS += $(CFLAGS_USER) -g
TESTS_CXXFLAGS += $(CXXFLAGS_USER) -g -std=gnu++11
-TESTS_LDLIBS := -lpthread -lvmm -lbenchutil -lm -lndblib -liplib
+TESTS_LDLIBS := -lpthread -lvmm -lbenchutil -lm -lndblib -liplib -ldl
TESTS_SRCS_C := $(wildcard $(TESTS_DIR)/*.c)
TESTS_SRCS_CPP := $(wildcard $(TESTS_DIR)/*.cc)
diff --git a/tests/hello.c b/tests/hello.c
index 53618ac..072b691 100644
--- a/tests/hello.c
+++ b/tests/hello.c
@@ -4,8 +4,11 @@
#include <unistd.h>
#include <signal.h>
+#include <string.h>
+
static void sig_hand(int signr)
{
+ memmove((void*)signr, (void*)0, 16);
printf("Got posix signal %d\n", signr);
}
@@ -17,6 +20,9 @@
printf("Hello world from program %s!!\n", argv[0]);
sys_block(5000);
kill(getpid(), SIGTERM);
- printf("Done\n");
+
+ void * x = memmove(argv[0], argv[1], 16);
+
+ printf("Done\n", x);
return 0;
}
diff --git a/user/parlib/memmove.c b/user/parlib/memmove.c
new file mode 100644
index 0000000..13ad32e
--- /dev/null
+++ b/user/parlib/memmove.c
@@ -0,0 +1,37 @@
+#define _GNU_SOURCE
+#include <dlfcn.h>
+#include <parlib/vcore.h>
+
+#include <string.h>
+
+#include <stdio.h>
+
+static void *parlib_memmove(void *dest, const void *src, size_t n)
+{
+ const char *s;
+ char *d;
+
+ s = src;
+ d = dest;
+ if (s < d && s + n > d) {
+ s += n;
+ d += n;
+ while (n-- > 0)
+ *--d = *--s;
+ } else
+ while (n-- > 0)
+ *d++ = *s++;
+
+ return dest;
+}
+
+void *memmove(void *dest, const void *src, size_t n)
+{
+ static void *(*glibc_memmove)(void *, const void *, size_t) = 0;
+
+ if (in_vcore_context())
+ return parlib_memmove(dest, src, n);
+ if (!glibc_memmove)
+ glibc_memmove = dlsym(RTLD_NEXT, "memmove");
+ return glibc_memmove(dest, src, n);
+}
diff --git a/user/utest/Makefile b/user/utest/Makefile
index eb50640..877ccd9 100644
--- a/user/utest/Makefile
+++ b/user/utest/Makefile
@@ -10,7 +10,7 @@
OBJDIR := $(SRCDIR)obj
INCDIR = $(SRCDIR)include
-LDLIBS := -lpthread -lbenchutil -lm -liplib -lndblib -lelectric-fence
+LDLIBS := -lpthread -lbenchutil -lm -liplib -lndblib -lelectric-fence -ldl
uc = $(shell echo $(1) | tr a-z A-Z)
