Commit 165cd1ee authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Andrei Vagin

criu/pie: kill util-fd.c

The functions it provides, send_fds() and receive_fds(), are already
provided by compel/plugins/std.built-in.o (compel/plugins/std/fds.c)
which is linked into both parasite and restorer.

This fixes the following issue (for some reason, reported on ARMv7,
see https://travis-ci.org/kolyshkin/criu/jobs/195367825):

  LINK     criu/pie/parasite.built-in.o
  GEN      criu/pie/parasite.built-in.bin.o
criu/pie/pie.lib.a(util-fd.o): In function `send_fds':
/criu/include/common/scm-code.c:56: multiple definition of `send_fds'
criu/pie/parasite.built-in.o:/criu/include/common/scm-code.c:56: first
defined here
criu/pie/pie.lib.a(util-fd.o): In function `recv_fds':
/criu/include/common/scm-code.c:79: multiple definition of `recv_fds'
criu/pie/parasite.built-in.o:/criu/include/common/scm-code.c:79: first
defined here
criu/pie/Makefile:53: recipe for target
'criu/pie/parasite.built-in.bin.o' failed
make[2]: *** [criu/pie/parasite.built-in.bin.o] Error 1

travis-ci: success for criu/pie: kill util-fd.c
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent b4aa7a37
......@@ -3,7 +3,7 @@ lib-name := pie.lib.a
CFLAGS += -fno-stack-protector -DCR_NOGLIBC -fpie
LDFLAGS += -z noexecstack
lib-y += util-fd.o util.o string.o
lib-y += util.o string.o
ifeq ($(VDSO),y)
lib-y += util-vdso.o parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
......
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/mount.h>
#include <stdbool.h>
#include <errno.h>
#include "int.h"
#include "types.h"
#include "common/compiler.h"
#include "log.h"
#include "string.h"
#ifdef CR_NOGLIBC
# include <compel/plugins/std/syscall.h>
# define __sys(foo) sys_##foo
# define __sys_err(ret) ret
#else
# define __sys(foo) foo
# define __sys_err(ret) (-errno)
#endif
#include "util-pie.h"
#include "fcntl.h"
#include "common/bug.h"
#include "common/scm-code.c"
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