wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

configure-Crosscompiling: Replace patch, improve check instead of removing.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-07-14 22:35:37 +02:00
parent 9f011de1b5
commit d26abf2d93
3 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/configure-Crosscompiling/0001-configure.ac-Do-not-assume-gcc-strength-bug-when-cro.patch Normal file
View File

@ -0,0 +1,25 @@
From 07bde54374454532f5808b5f1219a6bf2b17d1a9 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 14 Jul 2015 22:32:55 +0200
Subject: configure.ac: Do not assume gcc strength bug when crosscompiling.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3eaec29..9aab130 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1797,7 +1797,7 @@ then
for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]];
L[[i]] = 4;
return (Array[[1]] != -2 || L[[2]] != 3)]])],
- [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
+ [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="no"]) )
if test "$ac_cv_c_gcc_strength_bug" = "yes"
then
EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"
--
2.4.5

42
patches/configure-Crosscompiling/0001-configure.ac-Remove-check-for-strength-reduce-bug.patch
View File

@ -1,42 +0,0 @@
From eb555bcc219bdd332d0bff45aa66c26f7a846307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 21 Jun 2015 20:04:34 +0200
Subject: configure.ac: Remove check for strength-reduce bug.
This was bug was fixed in gcc-2.7.2.1 which was released 19 years ago.
When cross compiling, the configure check currently assumes that the bug
is present, which produces a lot of noise with non-gcc compilers.
---
configure.ac | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3587a12..fa6a542 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1788,22 +1788,6 @@ if test "x${GCC}" = "xyes"
then
EXTRACFLAGS="-Wall -pipe"
- dnl Check for strength-reduce bug
- AC_CACHE_CHECK( [for gcc strength-reduce bug], ac_cv_c_gcc_strength_bug,
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[int L[[4]] = {0,1,2,3};]],
-[[static int Array[[3]];
- unsigned int B = 3;
- int i;
- for(i=0; i<B; i++) Array[[i]] = i - 3;
- for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]];
- L[[i]] = 4;
- return (Array[[1]] != -2 || L[[2]] != 3)]])],
- [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
- if test "$ac_cv_c_gcc_strength_bug" = "yes"
- then
- EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"
- fi
-
dnl Check for some compiler flags
WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")])
WINE_TRY_CFLAGS([-fno-strict-aliasing])
--
2.4.3

4
patches/patchinstall.sh
View File

@ -2073,9 +2073,9 @@ fi
# | * configure.ac
# |
if test "$enable_configure_Crosscompiling" -eq 1; then
patch_apply configure-Crosscompiling/0001-configure.ac-Remove-check-for-strength-reduce-bug.patch
patch_apply configure-Crosscompiling/0001-configure.ac-Do-not-assume-gcc-strength-bug-when-cro.patch
(
echo '+ { "Michael Müller", "configure.ac: Remove check for strength-reduce bug.", 1 },';
echo '+ { "Sebastian Lackner", "configure.ac: Do not assume gcc strength bug when crosscompiling.", 1 },';
) >> "$patchlist"
fi