mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
ce21efa858
- Pull in fixes for TSC calibration driver preference (prefer pmtimer over PIT) to boot on Apollo Lake systems with no PIT - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From f4d35d49e32c29183b3492da18ea480d91716efe Mon Sep 17 00:00:00 2001
|
|
From: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
Date: Tue, 22 Mar 2016 20:12:22 +0300
|
|
Subject: [PATCH 011/123] configure: set -fno-pie together with -fno-PIE
|
|
|
|
OpenBSD 5.9 apparently defaults to -fpie. We use -fno-PIE when appropriate
|
|
already, but that is not enough - it does not turn off -fpie.
|
|
|
|
Actually check for -fPIE is not precise enough. __PIE__ is set for both
|
|
-fpie and -fPIE but with different values. As far as I can tell, both
|
|
options were introduced at the same time, so both should always be supported.
|
|
|
|
This fixes compilation on OpenBSD 5.9 which otherwise created insanely big
|
|
lzma_decompress.img.
|
|
|
|
Reported, suggested and tested by: Jiri B <jirib@devio.us>
|
|
---
|
|
configure.ac | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index a85b134ec..57e17138e 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1185,9 +1185,9 @@ CFLAGS="$TARGET_CFLAGS"
|
|
# Position independent executable.
|
|
grub_CHECK_PIE
|
|
[# Need that, because some distributions ship compilers that include
|
|
-# `-fPIE' in the default specs.
|
|
+# `-fPIE' or '-fpie' in the default specs.
|
|
if [ x"$pie_possible" = xyes ]; then
|
|
- TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
|
|
+ TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE -fno-pie"
|
|
fi]
|
|
|
|
CFLAGS="$TARGET_CFLAGS"
|
|
--
|
|
2.14.3
|
|
|