Commit 82382bea authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Andrei Vagin

pie.lib: drop second compat lib

No need in two libraries if we have only one parasite blob.
With left hand I write code - with right I erase it.

travis-ci: success for Rectify 32-bit compatible C/R on x86
Signed-off-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 44641325
target := pie lib-name := pie.lib.a
CFLAGS := $(filter-out -DCONFIG_X86_64,$(CFLAGS)) CFLAGS += -fno-stack-protector -DCR_NOGLIBC -fpie
CFLAGS += -fno-stack-protector -DCR_NOGLIBC
LDFLAGS += -z noexecstack LDFLAGS += -z noexecstack
CFLAGS_pie += -fpie lib-y += util-fd.o util.o string.o
ifeq ($(ARCH),x86)
ifeq ($(CONFIG_COMPAT),y)
target += compat
pie-lib-y += util-vdso-elf32.o
endif
CFLAGS_pie += -DCONFIG_X86_64
CFLAGS_compat += -fno-pic -m32 -DCONFIG_X86_32
CFLAGS_util-vdso-elf32.o += -DCONFIG_VDSO_32
OBJS += ./$(ARCH_DIR)/memcpy.o
endif
OBJS += util-fd.o util.o string.o
ifeq ($(VDSO),y) ifeq ($(VDSO),y)
OBJS += util-vdso.o parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o lib-y += util-vdso.o parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
ifeq ($(SRCARCH),aarch64) ifeq ($(SRCARCH),aarch64)
OBJS += ./$(ARCH_DIR)/intraprocedure.o lib-y += ./$(ARCH_DIR)/intraprocedure.o
endif endif
ifeq ($(SRCARCH),ppc64) ifeq ($(SRCARCH),ppc64)
OBJS += ./$(ARCH_DIR)/vdso-trampoline.o lib-y += ./$(ARCH_DIR)/vdso-trampoline.o
endif endif
endif endif
ifeq ($(SRCARCH),ppc64) ifeq ($(SRCARCH),ppc64)
OBJS += ./$(ARCH_DIR)/memcpy_power7.o \ lib-y += ./$(ARCH_DIR)/memcpy_power7.o \
./$(ARCH_DIR)/memcmp_64.o ./$(ARCH_DIR)/misc.o ./$(ARCH_DIR)/memcmp_64.o ./$(ARCH_DIR)/misc.o
endif endif
define gen-pie-objs ifeq ($(SRCARCH),x86)
pie-lib-y += $(1) ifeq ($(CONFIG_COMPAT),y)
CFLAGS_$(1) := $(CFLAGS_pie) lib-y += util-vdso-elf32.o
endef endif
CFLAGS_util-vdso-elf32.o += -DCONFIG_VDSO_32
compat-obj = $(basename $(notdir $(1)))-compat.o
define gen-compat-objs
compat-lib-y += $(dir ./$(call objectify,$(1)))compat/$(compat-obj)
CFLAGS_$(compat-obj) := $(CFLAGS_compat)
endef
$(eval $(call map,gen-pie-objs,$(OBJS))) lib-y += ./$(ARCH_DIR)/memcpy.o
$(eval $(call map,gen-compat-objs,$(OBJS))) endif
# #
# We can't provide proper mount implementation # We can't provide proper mount implementation
......
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