package/xvisor: fix build on x86 with PIC/PIE
PATCH 1/2 package/xvisor: fix build on x86 with PIC/PIE
Fixes:
- http://autobuild.buildroot.net/results/21d82ca5ca62d25be214a482017f4a671f7cc3d7
--- ...6-Fix-build-break-with-newer-GCC-7-x.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/xvisor/0001-x86-Fix-build-break-with-newer-GCC-7-x.patch
package/xvisor/0001-x86-Fix-build-break-with-newer-GCC-7-x.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 48b056d958e0d9ae5758b9c927b48a2e1d98cbcd Mon Sep 17 00:00:00 2001 +From: Himanshu Chauhan <[email protected]> +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 <[email protected]> +[Retrieved from: +https://github.com/xvisor/xvisor/commit/48b056d958e0d9ae5758b9c927b48a2e1d98cbcd] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + 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 at 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 +
Signature · 1 line
2.23.0
PATCH 2/2 package/xvisor: bump to version 0.2.11
- Remove patch (already in version)
- Add hash for license file
--- ...6-Fix-build-break-with-newer-GCC-7-x.patch | 34 ------------------- package/xvisor/xvisor.hash | 3 +- package/xvisor/xvisor.mk | 3 +- 3 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 package/xvisor/0001-x86-Fix-build-break-with-newer-GCC-7-x.patch
package/xvisor/0001-x86-Fix-build-break-with-newer-GCC-7-x.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 48b056d958e0d9ae5758b9c927b48a2e1d98cbcd Mon Sep 17 00:00:00 2001 -From: Himanshu Chauhan <[email protected]> -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 <[email protected]> -[Retrieved from: -https://github.com/xvisor/xvisor/commit/48b056d958e0d9ae5758b9c927b48a2e1d98cbcd] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - 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 at 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 -
package/xvisor/xvisor.hash +2 -1
@@ -1,2 +1,3 @@ # Locally generated -sha256 29b3b830380dde4f596611abd34487fb753e120ce462dbb0056f3025b88ef14f xvisor-0.2.9.tar.gz +sha256 a0c9537bd7fb06084c3da663f71bf6f2b1709e34b3b2fca2473c8db1cdd3de1d xvisor-0.2.11.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/xvisor/xvisor.mk +2 -1
@@ -4,7 +4,8 @@ # ################################################################################ -XVISOR_VERSION = 0.2.9 +XVISOR_VERSION = 0.2.11 +XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING
Signature · 1 line
2.23.0
Arnout Vandecappelle
AppliedPATCH 2/2 package/xvisor: bump to version 0.2.11
Quoted 4 lines · Fabrice Fontaine
- Remove patch (already in version)
- Add hash for license fileSigned-off-by Fabrice Fontaine <[email protected]>
Applied to master, thanks.
Note that I didn't apply the first patch, I just bumped the version.
Regards,
Arnout
PATCH 1/2 package/xvisor: fix build on x86 with PIC/PIE
In reply to Fabrice FontaineQuoted 4 lines · Fabrice Fontaine
Fixes:
- http://autobuild.buildroot.net/results/21d82ca5ca62d25be214a482017f4a671f7cc3d7Signed-off-by Fabrice Fontaine <[email protected]>
Peter, this one is for the stable branches. I applied the version bump to
master and that's sufficient for master.
Regards,
Arnout
PATCH 1/2 package/xvisor: fix build on x86 with PIC/PIE
In reply to Fabrice FontaineQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Fixes:
- http://autobuild.buildroot.net/results/21d82ca5ca62d25be214a482017f4a671f7cc3d7Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard