mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-19 04:47:52 +00:00
Merge branch 'gcc11-cross-canadian' of https://github.com/foss-for-synopsys-dwc-arc-processors/crosstool-ng
Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
commit
7daa182506
@ -4,7 +4,7 @@
|
||||
|
||||
--- a/libtool-ldflags
|
||||
+++ b/libtool-ldflags
|
||||
@@ -36,6 +36,11 @@ prev_arg=
|
||||
@@ -36,6 +36,11 @@
|
||||
for arg
|
||||
do
|
||||
case $arg in
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
--- a/libcc1/connection.cc
|
||||
+++ b/libcc1/connection.cc
|
||||
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <string>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
@ -16,31 +16,29 @@ libraries, and is not necessary in a well constructed toolchain.
|
||||
|
||||
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||
---
|
||||
libstdc++-v3/include/bits/std_abs.h | 4 ++--
|
||||
libstdc++-v3/include/c/cassert | 2 +-
|
||||
libstdc++-v3/include/c/cctype | 2 +-
|
||||
libstdc++-v3/include/c/cerrno | 2 +-
|
||||
libstdc++-v3/include/c/cfloat | 2 +-
|
||||
libstdc++-v3/include/c/climits | 2 +-
|
||||
libstdc++-v3/include/c/clocale | 2 +-
|
||||
libstdc++-v3/include/c/cmath | 2 +-
|
||||
libstdc++-v3/include/c/csetjmp | 2 +-
|
||||
libstdc++-v3/include/c/csignal | 2 +-
|
||||
libstdc++-v3/include/c/cstdarg | 2 +-
|
||||
libstdc++-v3/include/c/cstddef | 2 +-
|
||||
libstdc++-v3/include/c/cstdio | 2 +-
|
||||
libstdc++-v3/include/c/cstdlib | 2 +-
|
||||
libstdc++-v3/include/c/cstring | 2 +-
|
||||
libstdc++-v3/include/c/ctime | 2 +-
|
||||
libstdc++-v3/include/c/cuchar | 2 +-
|
||||
libstdc++-v3/include/c/cwchar | 2 +-
|
||||
libstdc++-v3/include/c/cwctype | 2 +-
|
||||
libstdc++-v3/include/c_global/cmath | 2 +-
|
||||
libstdc++-v3/include/c_global/cstdlib | 2 +-
|
||||
libstdc++-v3/include/bits/std_abs.h | 4 ++--
|
||||
libstdc++-v3/include/c/cassert | 2 +-
|
||||
libstdc++-v3/include/c/cctype | 2 +-
|
||||
libstdc++-v3/include/c/cerrno | 2 +-
|
||||
libstdc++-v3/include/c/cfloat | 2 +-
|
||||
libstdc++-v3/include/c/climits | 2 +-
|
||||
libstdc++-v3/include/c/clocale | 2 +-
|
||||
libstdc++-v3/include/c/cmath | 2 +-
|
||||
libstdc++-v3/include/c/csetjmp | 2 +-
|
||||
libstdc++-v3/include/c/csignal | 2 +-
|
||||
libstdc++-v3/include/c/cstdarg | 2 +-
|
||||
libstdc++-v3/include/c/cstddef | 2 +-
|
||||
libstdc++-v3/include/c/cstdio | 2 +-
|
||||
libstdc++-v3/include/c/cstdlib | 2 +-
|
||||
libstdc++-v3/include/c/cstring | 2 +-
|
||||
libstdc++-v3/include/c/ctime | 2 +-
|
||||
libstdc++-v3/include/c/cuchar | 2 +-
|
||||
libstdc++-v3/include/c/cwchar | 2 +-
|
||||
libstdc++-v3/include/c/cwctype | 2 +-
|
||||
libstdc++-v3/include/c_global/cmath | 2 +-
|
||||
libstdc++-v3/include/c_global/cstdlib | 2 +-
|
||||
21 files changed, 22 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/libstdc++-v3/include/bits/std_abs.h b/libstdc++-v3/include/bits/std_abs.h
|
||||
index ae6bfc1b1ac..249ed53a3ce 100644
|
||||
--- a/libstdc++-v3/include/bits/std_abs.h
|
||||
+++ b/libstdc++-v3/include/bits/std_abs.h
|
||||
@@ -35,9 +35,9 @@
|
||||
@ -55,8 +53,6 @@ index ae6bfc1b1ac..249ed53a3ce 100644
|
||||
#endif
|
||||
#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
||||
|
||||
diff --git a/libstdc++-v3/include/c/cassert b/libstdc++-v3/include/c/cassert
|
||||
index abd8c0538ef..3e1b97f1626 100644
|
||||
--- a/libstdc++-v3/include/c/cassert
|
||||
+++ b/libstdc++-v3/include/c/cassert
|
||||
@@ -31,4 +31,4 @@
|
||||
@ -65,8 +61,6 @@ index abd8c0538ef..3e1b97f1626 100644
|
||||
#include <bits/c++config.h>
|
||||
-#include_next <assert.h>
|
||||
+#include <assert.h>
|
||||
diff --git a/libstdc++-v3/include/c/cctype b/libstdc++-v3/include/c/cctype
|
||||
index d53cb3d43f3..3def33f2077 100644
|
||||
--- a/libstdc++-v3/include/c/cctype
|
||||
+++ b/libstdc++-v3/include/c/cctype
|
||||
@@ -31,6 +31,6 @@
|
||||
@ -77,8 +71,6 @@ index d53cb3d43f3..3def33f2077 100644
|
||||
+#include <ctype.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/cerrno b/libstdc++-v3/include/c/cerrno
|
||||
index a8d3869efb6..3725137c115 100644
|
||||
--- a/libstdc++-v3/include/c/cerrno
|
||||
+++ b/libstdc++-v3/include/c/cerrno
|
||||
@@ -41,7 +41,7 @@
|
||||
@ -90,8 +82,6 @@ index a8d3869efb6..3725137c115 100644
|
||||
|
||||
// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
|
||||
#ifndef errno
|
||||
diff --git a/libstdc++-v3/include/c/cfloat b/libstdc++-v3/include/c/cfloat
|
||||
index 5865d427c20..df821645e4d 100644
|
||||
--- a/libstdc++-v3/include/c/cfloat
|
||||
+++ b/libstdc++-v3/include/c/cfloat
|
||||
@@ -32,6 +32,6 @@
|
||||
@ -102,8 +92,6 @@ index 5865d427c20..df821645e4d 100644
|
||||
+#include <float.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/climits b/libstdc++-v3/include/c/climits
|
||||
index 849afadeffc..b153fa8c27c 100644
|
||||
--- a/libstdc++-v3/include/c/climits
|
||||
+++ b/libstdc++-v3/include/c/climits
|
||||
@@ -32,6 +32,6 @@
|
||||
@ -114,8 +102,6 @@ index 849afadeffc..b153fa8c27c 100644
|
||||
+#include <limits.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/clocale b/libstdc++-v3/include/c/clocale
|
||||
index fc84745397d..5ebccdf5006 100644
|
||||
--- a/libstdc++-v3/include/c/clocale
|
||||
+++ b/libstdc++-v3/include/c/clocale
|
||||
@@ -31,6 +31,6 @@
|
||||
@ -126,8 +112,6 @@ index fc84745397d..5ebccdf5006 100644
|
||||
+#include <locale.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/cmath b/libstdc++-v3/include/c/cmath
|
||||
index 2c51f2f13bc..2fcd09e4ef9 100644
|
||||
--- a/libstdc++-v3/include/c/cmath
|
||||
+++ b/libstdc++-v3/include/c/cmath
|
||||
@@ -33,7 +33,7 @@
|
||||
@ -139,8 +123,6 @@ index 2c51f2f13bc..2fcd09e4ef9 100644
|
||||
|
||||
// Get rid of those macros defined in <math.h> in lieu of real functions.
|
||||
#undef abs
|
||||
diff --git a/libstdc++-v3/include/c/csetjmp b/libstdc++-v3/include/c/csetjmp
|
||||
index db83610d95f..5abafcb160d 100644
|
||||
--- a/libstdc++-v3/include/c/csetjmp
|
||||
+++ b/libstdc++-v3/include/c/csetjmp
|
||||
@@ -31,7 +31,7 @@
|
||||
@ -152,8 +134,6 @@ index db83610d95f..5abafcb160d 100644
|
||||
|
||||
// Get rid of those macros defined in <setjmp.h> in lieu of real functions.
|
||||
#undef longjmp
|
||||
diff --git a/libstdc++-v3/include/c/csignal b/libstdc++-v3/include/c/csignal
|
||||
index 986c5d3daca..77cb7634a69 100644
|
||||
--- a/libstdc++-v3/include/c/csignal
|
||||
+++ b/libstdc++-v3/include/c/csignal
|
||||
@@ -31,6 +31,6 @@
|
||||
@ -164,8 +144,6 @@ index 986c5d3daca..77cb7634a69 100644
|
||||
+#include <signal.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/cstdarg b/libstdc++-v3/include/c/cstdarg
|
||||
index 6b6e1850753..0dfc60cc6ba 100644
|
||||
--- a/libstdc++-v3/include/c/cstdarg
|
||||
+++ b/libstdc++-v3/include/c/cstdarg
|
||||
@@ -32,6 +32,6 @@
|
||||
@ -176,8 +154,6 @@ index 6b6e1850753..0dfc60cc6ba 100644
|
||||
+#include <stdarg.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/cstddef b/libstdc++-v3/include/c/cstddef
|
||||
index 7fc8ce34efc..fc90dfb3f18 100644
|
||||
--- a/libstdc++-v3/include/c/cstddef
|
||||
+++ b/libstdc++-v3/include/c/cstddef
|
||||
@@ -35,6 +35,6 @@
|
||||
@ -188,8 +164,6 @@ index 7fc8ce34efc..fc90dfb3f18 100644
|
||||
+#include <stddef.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/cstdio b/libstdc++-v3/include/c/cstdio
|
||||
index e943aa8e725..89bcd2d7391 100644
|
||||
--- a/libstdc++-v3/include/c/cstdio
|
||||
+++ b/libstdc++-v3/include/c/cstdio
|
||||
@@ -31,7 +31,7 @@
|
||||
@ -201,8 +175,6 @@ index e943aa8e725..89bcd2d7391 100644
|
||||
|
||||
// Get rid of those macros defined in <stdio.h> in lieu of real functions.
|
||||
#undef clearerr
|
||||
diff --git a/libstdc++-v3/include/c/cstdlib b/libstdc++-v3/include/c/cstdlib
|
||||
index 86d9587482f..a26013286be 100644
|
||||
--- a/libstdc++-v3/include/c/cstdlib
|
||||
+++ b/libstdc++-v3/include/c/cstdlib
|
||||
@@ -31,6 +31,6 @@
|
||||
@ -213,8 +185,6 @@ index 86d9587482f..a26013286be 100644
|
||||
+#include <stdlib.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/cstring b/libstdc++-v3/include/c/cstring
|
||||
index 8b1e89b13b6..ca56c75e753 100644
|
||||
--- a/libstdc++-v3/include/c/cstring
|
||||
+++ b/libstdc++-v3/include/c/cstring
|
||||
@@ -31,6 +31,6 @@
|
||||
@ -225,8 +195,6 @@ index 8b1e89b13b6..ca56c75e753 100644
|
||||
+#include <string.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/ctime b/libstdc++-v3/include/c/ctime
|
||||
index 367172b21eb..135da2a25c4 100644
|
||||
--- a/libstdc++-v3/include/c/ctime
|
||||
+++ b/libstdc++-v3/include/c/ctime
|
||||
@@ -31,6 +31,6 @@
|
||||
@ -237,8 +205,6 @@ index 367172b21eb..135da2a25c4 100644
|
||||
+#include <time.h>
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c/cuchar b/libstdc++-v3/include/c/cuchar
|
||||
index e63b55ae12c..c79708fba6a 100644
|
||||
--- a/libstdc++-v3/include/c/cuchar
|
||||
+++ b/libstdc++-v3/include/c/cuchar
|
||||
@@ -39,7 +39,7 @@
|
||||
@ -250,8 +216,6 @@ index e63b55ae12c..c79708fba6a 100644
|
||||
#endif
|
||||
|
||||
#endif // C++11
|
||||
diff --git a/libstdc++-v3/include/c/cwchar b/libstdc++-v3/include/c/cwchar
|
||||
index 05d4d70c6fc..0fc9a9a394a 100644
|
||||
--- a/libstdc++-v3/include/c/cwchar
|
||||
+++ b/libstdc++-v3/include/c/cwchar
|
||||
@@ -36,7 +36,7 @@
|
||||
@ -263,8 +227,6 @@ index 05d4d70c6fc..0fc9a9a394a 100644
|
||||
#endif
|
||||
|
||||
// Need to do a bit of trickery here with mbstate_t as char_traits
|
||||
diff --git a/libstdc++-v3/include/c/cwctype b/libstdc++-v3/include/c/cwctype
|
||||
index 0626765d6c8..4839b693e46 100644
|
||||
--- a/libstdc++-v3/include/c/cwctype
|
||||
+++ b/libstdc++-v3/include/c/cwctype
|
||||
@@ -34,7 +34,7 @@
|
||||
@ -276,8 +238,6 @@ index 0626765d6c8..4839b693e46 100644
|
||||
#endif
|
||||
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
|
||||
index 39a6b036b8c..bfb6dcd4c88 100644
|
||||
--- a/libstdc++-v3/include/c_global/cmath
|
||||
+++ b/libstdc++-v3/include/c_global/cmath
|
||||
@@ -42,7 +42,7 @@
|
||||
@ -289,11 +249,9 @@ index 39a6b036b8c..bfb6dcd4c88 100644
|
||||
#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
||||
#include <bits/std_abs.h>
|
||||
|
||||
diff --git a/libstdc++-v3/include/c_global/cstdlib b/libstdc++-v3/include/c_global/cstdlib
|
||||
index 47b954cf2fa..996a87b372c 100644
|
||||
--- a/libstdc++-v3/include/c_global/cstdlib
|
||||
+++ b/libstdc++-v3/include/c_global/cstdlib
|
||||
@@ -72,7 +72,7 @@ namespace std
|
||||
@@ -72,7 +72,7 @@
|
||||
// Need to ensure this finds the C library's <stdlib.h> not a libstdc++
|
||||
// wrapper that might already be installed later in the include search path.
|
||||
#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
||||
@ -302,6 +260,3 @@ index 47b954cf2fa..996a87b372c 100644
|
||||
#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
||||
#include <bits/std_abs.h>
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
47
packages/gcc/11.2.0/0005-Fix-cross-native-cross-caandian-builds.patch
vendored
Normal file
47
packages/gcc/11.2.0/0005-Fix-cross-native-cross-caandian-builds.patch
vendored
Normal file
@ -0,0 +1,47 @@
|
||||
From 7f13ba28a4aac454ada29552acdf9a44697ad5a8 Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Date: Wed, 15 Sep 2021 01:08:06 -0700
|
||||
Subject: [PATCH] Fix cross-native/cross-caandian builds
|
||||
|
||||
See upstream bug report [1] for more details.
|
||||
Basically when we do cross-canadian build with
|
||||
use of the same GCC11 as a "host" compiler we're seeing
|
||||
an error like that:
|
||||
------------------->8-------------------
|
||||
mingw-w64-cross/gcc/x86_64-w64-mingw32/libstdc++-v3/include/fenv.h:58:11: error: 'fenv_t' has not been declared in '::'
|
||||
58 | using ::fenv_t;
|
||||
------------------->8-------------------
|
||||
|
||||
This is a solution proposed by Yujie Yang in [2]
|
||||
|
||||
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017
|
||||
[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017#c20
|
||||
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
---
|
||||
configure | 2 +-
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -16478,7 +16478,7 @@
|
||||
fi
|
||||
|
||||
|
||||
-RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
|
||||
+RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++"
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ar" >&5
|
||||
$as_echo_n "checking where to find the target ar... " >&6; }
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3520,7 +3520,7 @@
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc)
|
||||
|
||||
-RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
|
||||
+RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++"
|
||||
|
||||
GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar])
|
||||
GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new])
|
Loading…
Reference in New Issue
Block a user