[CRIU] [PATCH 04/23] pie: provide own memcpy for x86 (-> master)

[Kir Kolyshkin]

Attached is a fixed version of a ported patch.

The thing is, in this (older) version of criu/pie/Makefile.library
you need to use $(SRCARCH) not $(ARCH), like all others do.
In other words:

diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index 61d84d2..180985d 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -22,8 +22,8 @@ ifeq ($(SRCARCH),ppc64)
          lib-y        += ./$(ARCH_DIR)/misc.o
  endif

-ifeq ($(ARCH),x86)
-        OBJS        += ./$(ARCH_DIR)/memcpy.o
+ifeq ($(SRCARCH),x86)
+        lib-y        += ./$(ARCH_DIR)/memcpy.o
  endif

  #

As far as I can see, tests are now passed.

On 10/24/2016 06:06 AM, Pavel Emelyanov wrote:
> Kir :)
>
> I've tried to merge this commit into master branch and hit into problem. First
> of all, it didn't apply smoothly, I had to patch the criu/pie/Makefile.library
> like this:
>
> @@ -2,6 +2,10 @@ lib-y			+= log-simple.o
>   lib-y			+= util-fd.o
>   lib-y			+= util.o
>   
> +ifeq ($(ARCH),x86)
> +        OBJS		+= ./$(ARCH_DIR)/memcpy.o
> +endif
> +
>   ifeq ($(VDSO),y)
>           lib-y		+= util-vdso.o
>           lib-y		+= parasite-vdso.o
>
>
> but that seems to comply with what's there in criu-dev. After this all tests
> started to fail, like this:
>
> Run criu dump
> =[log]=> dump/zdtm/static/env00/39/1/dump.log
> ------------------------ grep Error ------------------------
> (00.011268) Error (criu/parasite-syscall.c:394): si_code=4 si_pid=39 si_status=11
> (00.011278) Error (criu/parasite-syscall.c:402): 39 was stopped by 11 unexpectedly
>
> Would you please take a look? The patch is good to be shipped with master
> branch next release.
>
> -- Pavel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-pie-provide-own-memcpy-for-x86.patch
Type: text/x-patch
Size: 4234 bytes
Desc: not available
URL: <http://lists.openvz.org/pipermail/criu/attachments/20161026/5d030b2a/attachment.bin>