mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-21 05:43:09 +00:00
839bfbec6d
https://gcc.gnu.org/pipermail/gcc-announce/2024/000182.html Add the new version dropping patches that have been applied upstream. Fixes #2175 Signed-off-by: Chris Packham <judge.packham@gmail.com>
263 lines
6.6 KiB
Diff
263 lines
6.6 KiB
Diff
From ed1daa2cc9130e7807f32d515d16597fd2df8c25 Mon Sep 17 00:00:00 2001
|
|
From: Keith Packard <keithp@keithp.com>
|
|
Date: Sun, 24 Jan 2021 14:20:33 -0800
|
|
Subject: [PATCH] Remove use of include_next from c++ headers
|
|
|
|
Using include_next bypasses the default header search path and lets
|
|
files later in the include path take priority over earlier files.
|
|
|
|
This makes replacing libc impossible as the default libc headers will
|
|
occur after the libstdc++ headers, and so be picked up in place of
|
|
headers inserted at the begining of the search path or appended to the
|
|
end of the search path.
|
|
|
|
Using include_next is a hack to work-around broken combinations of
|
|
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 +-
|
|
21 files changed, 22 insertions(+), 22 deletions(-)
|
|
|
|
--- a/libstdc++-v3/include/bits/std_abs.h
|
|
+++ b/libstdc++-v3/include/bits/std_abs.h
|
|
@@ -35,9 +35,9 @@
|
|
#include <bits/c++config.h>
|
|
|
|
#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
|
-#include_next <stdlib.h>
|
|
+#include <stdlib.h>
|
|
#ifdef __CORRECT_ISO_CPP_MATH_H_PROTO
|
|
-# include_next <math.h>
|
|
+# include <math.h>
|
|
#endif
|
|
#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
|
|
|
--- a/libstdc++-v3/include/c/cassert
|
|
+++ b/libstdc++-v3/include/c/cassert
|
|
@@ -31,4 +31,4 @@
|
|
#pragma GCC system_header
|
|
|
|
#include <bits/c++config.h>
|
|
-#include_next <assert.h>
|
|
+#include <assert.h>
|
|
--- a/libstdc++-v3/include/c/cctype
|
|
+++ b/libstdc++-v3/include/c/cctype
|
|
@@ -31,6 +31,6 @@
|
|
|
|
#pragma GCC system_header
|
|
|
|
-#include_next <ctype.h>
|
|
+#include <ctype.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/cerrno
|
|
+++ b/libstdc++-v3/include/c/cerrno
|
|
@@ -41,7 +41,7 @@
|
|
#pragma GCC system_header
|
|
|
|
#include <bits/c++config.h>
|
|
-#include_next <errno.h>
|
|
+#include <errno.h>
|
|
|
|
// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
|
|
#ifndef errno
|
|
--- a/libstdc++-v3/include/c/cfloat
|
|
+++ b/libstdc++-v3/include/c/cfloat
|
|
@@ -32,6 +32,6 @@
|
|
#pragma GCC system_header
|
|
|
|
#include <bits/c++config.h>
|
|
-#include_next <float.h>
|
|
+#include <float.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/climits
|
|
+++ b/libstdc++-v3/include/c/climits
|
|
@@ -32,6 +32,6 @@
|
|
#pragma GCC system_header
|
|
|
|
#include <bits/c++config.h>
|
|
-#include_next <limits.h>
|
|
+#include <limits.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/clocale
|
|
+++ b/libstdc++-v3/include/c/clocale
|
|
@@ -31,6 +31,6 @@
|
|
|
|
#pragma GCC system_header
|
|
|
|
-#include_next <locale.h>
|
|
+#include <locale.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/cmath
|
|
+++ b/libstdc++-v3/include/c/cmath
|
|
@@ -33,7 +33,7 @@
|
|
|
|
#include <bits/c++config.h>
|
|
|
|
-#include_next <math.h>
|
|
+#include <math.h>
|
|
|
|
// Get rid of those macros defined in <math.h> in lieu of real functions.
|
|
#undef abs
|
|
--- a/libstdc++-v3/include/c/csetjmp
|
|
+++ b/libstdc++-v3/include/c/csetjmp
|
|
@@ -31,7 +31,7 @@
|
|
|
|
#pragma GCC system_header
|
|
|
|
-#include_next <setjmp.h>
|
|
+#include <setjmp.h>
|
|
|
|
// Get rid of those macros defined in <setjmp.h> in lieu of real functions.
|
|
#undef longjmp
|
|
--- a/libstdc++-v3/include/c/csignal
|
|
+++ b/libstdc++-v3/include/c/csignal
|
|
@@ -31,6 +31,6 @@
|
|
|
|
#pragma GCC system_header
|
|
|
|
-#include_next <signal.h>
|
|
+#include <signal.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/cstdarg
|
|
+++ b/libstdc++-v3/include/c/cstdarg
|
|
@@ -32,6 +32,6 @@
|
|
#pragma GCC system_header
|
|
|
|
#undef __need___va_list
|
|
-#include_next <stdarg.h>
|
|
+#include <stdarg.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/cstddef
|
|
+++ b/libstdc++-v3/include/c/cstddef
|
|
@@ -35,6 +35,6 @@
|
|
#define __need_ptrdiff_t
|
|
#define __need_NULL
|
|
#define __need_offsetof
|
|
-#include_next <stddef.h>
|
|
+#include <stddef.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/cstdio
|
|
+++ b/libstdc++-v3/include/c/cstdio
|
|
@@ -31,7 +31,7 @@
|
|
|
|
#pragma GCC system_header
|
|
|
|
-#include_next <stdio.h>
|
|
+#include <stdio.h>
|
|
|
|
// Get rid of those macros defined in <stdio.h> in lieu of real functions.
|
|
#undef clearerr
|
|
--- a/libstdc++-v3/include/c/cstdlib
|
|
+++ b/libstdc++-v3/include/c/cstdlib
|
|
@@ -31,6 +31,6 @@
|
|
|
|
#pragma GCC system_header
|
|
|
|
-#include_next <stdlib.h>
|
|
+#include <stdlib.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/cstring
|
|
+++ b/libstdc++-v3/include/c/cstring
|
|
@@ -31,6 +31,6 @@
|
|
|
|
#pragma GCC system_header
|
|
|
|
-#include_next <string.h>
|
|
+#include <string.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/ctime
|
|
+++ b/libstdc++-v3/include/c/ctime
|
|
@@ -31,6 +31,6 @@
|
|
|
|
#pragma GCC system_header
|
|
|
|
-#include_next <time.h>
|
|
+#include <time.h>
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c/cuchar
|
|
+++ b/libstdc++-v3/include/c/cuchar
|
|
@@ -39,7 +39,7 @@
|
|
#include <cwchar>
|
|
|
|
#if _GLIBCXX_USE_C11_UCHAR_CXX11
|
|
-# include_next <uchar.h>
|
|
+# include <uchar.h>
|
|
#endif
|
|
|
|
#endif // C++11
|
|
--- a/libstdc++-v3/include/c/cwchar
|
|
+++ b/libstdc++-v3/include/c/cwchar
|
|
@@ -36,7 +36,7 @@
|
|
#include <ctime>
|
|
|
|
#if _GLIBCXX_HAVE_WCHAR_H
|
|
-#include_next <wchar.h>
|
|
+#include <wchar.h>
|
|
#endif
|
|
|
|
// Need to do a bit of trickery here with mbstate_t as char_traits
|
|
--- a/libstdc++-v3/include/c/cwctype
|
|
+++ b/libstdc++-v3/include/c/cwctype
|
|
@@ -34,7 +34,7 @@
|
|
#include <bits/c++config.h>
|
|
|
|
#if _GLIBCXX_HAVE_WCTYPE_H
|
|
-#include_next <wctype.h>
|
|
+#include <wctype.h>
|
|
#endif
|
|
|
|
#endif
|
|
--- a/libstdc++-v3/include/c_global/cmath
|
|
+++ b/libstdc++-v3/include/c_global/cmath
|
|
@@ -42,7 +42,7 @@
|
|
#include <bits/cpp_type_traits.h>
|
|
#include <ext/type_traits.h>
|
|
#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
|
-#include_next <math.h>
|
|
+#include <math.h>
|
|
#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
|
#include <bits/std_abs.h>
|
|
|
|
--- a/libstdc++-v3/include/c_global/cstdlib
|
|
+++ b/libstdc++-v3/include/c_global/cstdlib
|
|
@@ -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
|
|
-#include_next <stdlib.h>
|
|
+#include <stdlib.h>
|
|
#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
|
#include <bits/std_abs.h>
|
|
|