From mboxrd@z Thu Jan 1 00:00:00 1970 From: riku.voipio@linaro.org Subject: [PATCH v2] kvmtool: Makefile: disable PIE build for bios and pre_init Date: Fri, 4 Nov 2016 15:28:00 +0200 Message-ID: <20161104132800.11786-1-riku.voipio@linaro.org> Cc: will.deacon@arm.com, Riku Voipio To: kvm@vger.kernel.org Return-path: Received: from mail-lf0-f41.google.com ([209.85.215.41]:36004 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760973AbcKDN2I (ORCPT ); Fri, 4 Nov 2016 09:28:08 -0400 Received: by mail-lf0-f41.google.com with SMTP id t196so63880316lff.3 for ; Fri, 04 Nov 2016 06:28:07 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: From: Riku Voipio Latest Debian and Ubuntu GCC default to PIE code. Disable PIC for bios and PIE for pre_init. Since the flag -no-pie is not available on older GCC's, make use of flag only if the option is available. -fno-pic is more widely available and should be safe to enable uncondionally. Signed-off-by: Riku Voipio --- v2: BIOS_FLAGS doesn't need -no-pie so don't set it Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1f0196f..eeb54a4 100644 --- a/Makefile +++ b/Makefile @@ -284,7 +284,7 @@ ifeq ($(call try-build,$(SOURCE_STATIC),$(CFLAGS),$(LDFLAGS) -static),y) GUEST_INIT := guest/init GUEST_OBJS = guest/guest_init.o ifeq ($(ARCH_PRE_INIT),) - GUEST_INIT_FLAGS += -static + GUEST_INIT_FLAGS += -static $(PIE_FLAGS) else CFLAGS += -DCONFIG_GUEST_PRE_INIT GUEST_INIT_FLAGS += -DCONFIG_GUEST_PRE_INIT @@ -307,6 +307,10 @@ ifeq (y,$(ARCH_WANT_LIBFDT)) endif endif +ifeq ($(call try-build,$(SOURCE_HELLO),$(CFLAGS),-no-pie),y) + PIE_FLAGS += -no-pie +endif + ifneq ($(NOTFOUND),) $(warning Skipping optional libraries: $(NOTFOUND)) endif @@ -388,7 +392,7 @@ $(PROGRAM_ALIAS): $(PROGRAM) ifneq ($(ARCH_PRE_INIT),) $(GUEST_PRE_INIT): $(ARCH_PRE_INIT) $(E) " LINK " $@ - $(Q) $(CC) -s -nostdlib $(ARCH_PRE_INIT) -o $@ + $(Q) $(CC) -s $(PIE_FLAGS) -nostdlib $(ARCH_PRE_INIT) -o $@ $(Q) $(LD) -r -b binary -o guest/guest_pre_init.o $(GUEST_PRE_INIT) endif @@ -435,6 +439,7 @@ BIOS_CFLAGS += -march=i386 BIOS_CFLAGS += -mregparm=3 BIOS_CFLAGS += -fno-stack-protector +BIOS_CFLAGS += -fno-pic x86/bios.o: x86/bios/bios.bin x86/bios/bios-rom.h -- 2.10.1