35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 48b056d958e0d9ae5758b9c927b48a2e1d98cbcd Mon Sep 17 00:00:00 2001
|
|
From: Himanshu Chauhan <hchauhan@xvisor-x86.org>
|
|
Date: Mon, 4 Dec 2017 18:29:09 +0530
|
|
Subject: [PATCH] [x86] Fix build break with newer GCC (7.x)
|
|
|
|
add -no-pie to C and LD flags. GCC 7.x for some reason
|
|
doesn't like to mix 32-bit and 64-bit code and wants
|
|
such code to be compiled with fPIC. Disable PIE from
|
|
does the trick.
|
|
|
|
Signed-off-by: Himanshu Chauhan <hchauhan@xvisor-x86.org>
|
|
[Retrieved from:
|
|
https://github.com/xvisor/xvisor/commit/48b056d958e0d9ae5758b9c927b48a2e1d98cbcd]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
arch/x86/cpu/x86_64/objects.mk | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/x86/cpu/x86_64/objects.mk b/arch/x86/cpu/x86_64/objects.mk
|
|
index a3bed4641..1d6d5a2fb 100644
|
|
--- a/arch/x86/cpu/x86_64/objects.mk
|
|
+++ b/arch/x86/cpu/x86_64/objects.mk
|
|
@@ -21,8 +21,9 @@
|
|
# @author Himanshu Chauhan (hschauhan@nulltrace.org)
|
|
# @brief list of x86_64 object files.
|
|
# */
|
|
-cpu-cflags +=-finline-functions -O0 -mcmodel=large
|
|
-cpu-cppflags +=-DCPU_TEXT_LMA=${CONFIG_VAPOOL_ALIGN_MB}
|
|
+cpu-cflags +=-finline-functions -O0 -mcmodel=large -no-pie
|
|
+cpu-cppflags +=-DCPU_TEXT_LMA=${CONFIG_VAPOOL_ALIGN_MB} -no-pie
|
|
+cpu-ldflags += -no-pie
|
|
|
|
cpu-objs-y+= start.o
|
|
|