Commit 24a2cec4 authored by Christopher Covington's avatar Christopher Covington Committed by Pavel Emelyanov

ZDTM build fixes

Errors building natively for x86_64 on Ubuntu 12.04:

session02.c:142:13: error: ‘PR_SET_CHILD_SUBREAPER’ undeclared

session03.c:175:13: error: ‘PR_SET_CHILD_SUBREAPER’ undeclared

vdso01.c:300: undefined reference to `clock_gettime'

Error cross compiling for arm using Linaro 14.01 toolchain:

gcc: warning: ‘-mcpu=’ is deprecated; use ‘-mtune=’ or ‘-march=’ instead
cc1: error: unrecognized command line option ‘-mfpu=neon’
cc1: error: unrecognized command line option ‘-marm’
criu-rtc.c:1:0: error: bad value (cortex-a15) for -mtune= switch
cc1: error: unrecognized command line option ‘-mfpu=neon’
cc1: error: unrecognized command line option ‘-marm’
criu-rtc.pb-c.c:1:0: error: bad value (cortex-a15) for -mtune= switch

Errors cross compiling for aarch64 using Linaro 14.01 toolchain:

maps007.c: In function ‘main’:
maps007.c:88:4: error: passing argument 1 of ‘atomic_read’ from incompatible pointer type [-Werror]
    if (futex_get(&shm->stop) && atomic_get(&shm->delta) == MAX_DELTA)
    ^
In file included from ../../lib/lock.h:10:0,
                 from maps007.c:13:
../../lib/arch/aarch64/include/asm/atomic.h:14:19: note: expected ‘const atomic_t *’ but argument is of type ‘struct f
utex_t *’
 static inline int atomic_read(const atomic_t *v)
                   ^

ptrace.c: In function ‘main’:
ptrace.c:97:15: error: ‘PTRACE_GETREGS’ undeclared (first use in this function)
    if (ptrace(PTRACE_GETREGS, stopped, NULL, regs)) {
               ^
Signed-off-by: 's avatarChristopher Covington <cov@codeaurora.org>
Reviewed-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 241019b6
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
# define PAGE_SIZE 4096 # define PAGE_SIZE 4096
#endif #endif
#ifndef PR_SET_CHILD_SUBREAPER
# define PR_SET_CHILD_SUBREAPER 36
#endif
/* set up test */ /* set up test */
extern void test_ext_init(int argc, char **argv); extern void test_ext_init(int argc, char **argv);
extern void test_init(int argc, char **argv); extern void test_init(int argc, char **argv);
......
...@@ -277,6 +277,7 @@ socket-tcpbuf6: override CFLAGS += -D ZDTM_IPV6 ...@@ -277,6 +277,7 @@ socket-tcpbuf6: override CFLAGS += -D ZDTM_IPV6
socket-tcpbuf-local: override CFLAGS += -D ZDTM_TCP_LOCAL socket-tcpbuf-local: override CFLAGS += -D ZDTM_TCP_LOCAL
socket_listen6: override CFLAGS += -D ZDTM_IPV6 socket_listen6: override CFLAGS += -D ZDTM_IPV6
sigpending: override LDLIBS += -lrt sigpending: override LDLIBS += -lrt
vdso01: override LDLIBS += -lrt
$(LIB): force $(LIB): force
$(Q) $(MAKE) -C $(LIBDIR) $(Q) $(MAKE) -C $(LIBDIR)
...@@ -301,7 +302,7 @@ criu-rtc.pb-c.c: criu-rtc.proto ...@@ -301,7 +302,7 @@ criu-rtc.pb-c.c: criu-rtc.proto
protoc-c --proto_path=. --c_out=. criu-rtc.proto protoc-c --proto_path=. --c_out=. criu-rtc.proto
criu-rtc.so: criu-rtc.c criu-rtc.pb-c.c criu-rtc.so: criu-rtc.c criu-rtc.pb-c.c
gcc -g -Wall -shared -nostartfiles criu-rtc.c criu-rtc.pb-c.c -o criu-rtc.so -iquote ../../../../include -fPIC $(USERCFLAGS) $(CC) -g -Wall -shared -nostartfiles criu-rtc.c criu-rtc.pb-c.c -o criu-rtc.so -iquote ../../../../include -fPIC $(USERCFLAGS)
.PHONY: force clean cleandep cleanout realclean start check_start stop wait_stop .PHONY: force clean cleandep cleanout realclean start check_start stop wait_stop
......
...@@ -85,7 +85,7 @@ int main(int argc, char **argv) ...@@ -85,7 +85,7 @@ int main(int argc, char **argv)
if (!futex_get(&shm->stop)) if (!futex_get(&shm->stop))
futex_wait_while_lt(&shm->delta, MAX_DELTA); futex_wait_while_lt(&shm->delta, MAX_DELTA);
if (futex_get(&shm->stop) && atomic_get(&shm->delta) == MAX_DELTA) if (futex_get(&shm->stop) && atomic_get(&shm->delta.raw) == MAX_DELTA)
break; break;
futex_dec_and_wake(&shm->delta); futex_dec_and_wake(&shm->delta);
} }
......
...@@ -94,7 +94,7 @@ out_th: ...@@ -94,7 +94,7 @@ out_th:
} }
if (WIFSTOPPED(status)) { if (WIFSTOPPED(status)) {
if (ptrace(PTRACE_GETREGS, stopped, NULL, regs)) { if (ptrace(PTRACE_GETSIGINFO, stopped, NULL, regs)) {
/* FAIL */ /* FAIL */
fail("Ptrace won't work"); fail("Ptrace won't work");
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment