[CRIU] [PATCH] x86/compat: clean symlinks left from second parasite

Dmitry Safonov dsafonov at virtuozzo.com
Wed Feb 1 05:48:57 PST 2017


Those symlinks were for building 32-bit objects with `-m32` to
link them with 32-bit parasite. Since I have dropped second parasite,
I cleaned Makefile rules for 32-bit parasite, but accidentally left
those symlinks. Drop them now.

Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
 criu/arch/x86/compat/memcpy-compat.c   | 25 -------------------------
 criu/arch/x86/compat/vdso-pie-compat.c |  1 -
 criu/pie/compat/parasite-compat.c      |  1 -
 criu/pie/compat/parasite-vdso-compat.c |  1 -
 criu/pie/compat/util-compat.c          |  1 -
 criu/pie/compat/util-fd-compat.c       |  1 -
 criu/pie/compat/util-vdso-compat.c     |  1 -
 7 files changed, 31 deletions(-)
 delete mode 100644 criu/arch/x86/compat/memcpy-compat.c
 delete mode 120000 criu/arch/x86/compat/vdso-pie-compat.c
 delete mode 120000 criu/pie/compat/parasite-compat.c
 delete mode 120000 criu/pie/compat/parasite-vdso-compat.c
 delete mode 120000 criu/pie/compat/util-compat.c
 delete mode 120000 criu/pie/compat/util-fd-compat.c
 delete mode 120000 criu/pie/compat/util-vdso-compat.c

diff --git a/criu/arch/x86/compat/memcpy-compat.c b/criu/arch/x86/compat/memcpy-compat.c
deleted file mode 100644
index 793c27dcaa7d..000000000000
--- a/criu/arch/x86/compat/memcpy-compat.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <stddef.h>
-
-/*
- * This provides an optimized implementation of memcpy, and a simplified
- * implementation of memset and memmove. These are used here because the
- * standard kernel runtime versions are not yet available and we don't
- * trust the gcc built-in implementations as they may do unexpected things
- * (e.g. FPU ops) in the minimal decompression stub execution environment.
- *
- * From Linux kernel boot helpers: arch/x86/boot/compressed/string.c
- */
-
-void *memcpy_x86(void *dest, const void *src, size_t n)
-{
-	int d0, d1, d2;
-	asm volatile(
-		"rep ; movsl\n\t"
-		"movl %4,%%ecx\n\t"
-		"rep ; movsb\n\t"
-		: "=&c" (d0), "=&D" (d1), "=&S" (d2)
-		: "0" (n >> 2), "g" (n & 3), "1" (dest), "2" (src)
-		: "memory");
-
-	return dest;
-}
diff --git a/criu/arch/x86/compat/vdso-pie-compat.c b/criu/arch/x86/compat/vdso-pie-compat.c
deleted file mode 120000
index 98b1f39da2a9..000000000000
--- a/criu/arch/x86/compat/vdso-pie-compat.c
+++ /dev/null
@@ -1 +0,0 @@
-../vdso-pie.c
\ No newline at end of file
diff --git a/criu/pie/compat/parasite-compat.c b/criu/pie/compat/parasite-compat.c
deleted file mode 120000
index bc5cbac9d786..000000000000
--- a/criu/pie/compat/parasite-compat.c
+++ /dev/null
@@ -1 +0,0 @@
-../parasite.c
\ No newline at end of file
diff --git a/criu/pie/compat/parasite-vdso-compat.c b/criu/pie/compat/parasite-vdso-compat.c
deleted file mode 120000
index 95158832fdef..000000000000
--- a/criu/pie/compat/parasite-vdso-compat.c
+++ /dev/null
@@ -1 +0,0 @@
-../parasite-vdso.c
\ No newline at end of file
diff --git a/criu/pie/compat/util-compat.c b/criu/pie/compat/util-compat.c
deleted file mode 120000
index 39606ede1d95..000000000000
--- a/criu/pie/compat/util-compat.c
+++ /dev/null
@@ -1 +0,0 @@
-../util.c
\ No newline at end of file
diff --git a/criu/pie/compat/util-fd-compat.c b/criu/pie/compat/util-fd-compat.c
deleted file mode 120000
index 358f069dc8e3..000000000000
--- a/criu/pie/compat/util-fd-compat.c
+++ /dev/null
@@ -1 +0,0 @@
-../util-fd.c
\ No newline at end of file
diff --git a/criu/pie/compat/util-vdso-compat.c b/criu/pie/compat/util-vdso-compat.c
deleted file mode 120000
index 4caac4510d14..000000000000
--- a/criu/pie/compat/util-vdso-compat.c
+++ /dev/null
@@ -1 +0,0 @@
-../util-vdso.c
\ No newline at end of file
-- 
2.11.0



More information about the CRIU mailing list