diff options
| author |   Alexey Neyman <stilor@att.net> | 2022-02-11 02:00:59 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2022-02-11 08:47:51 (GMT) |
| commit | 86c2982568de1ad4d4cc12a65b19231331484405 (patch) | |
| tree | 2e0b3fb78c30877c0c152d59d0e0fff817b73822 /packages/gcc/10.3.0 | |
| parent | 1210b0c2f45e32ef0867ca00e16b6aadb6a81bf9 (diff) | |
Run patches thru `manage-packages -P`
This refreshes the line numbers, removes any fuzz (which would make any
future forward ports easier) and standardizes the patch/file headers
(which makes them easier to read).
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages/gcc/10.3.0')
18 files changed, 101 insertions, 171 deletions
diff --git a/packages/gcc/10.3.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/10.3.0/0000-libtool-leave-framework-alone.patch index b5804ea..1a86e41 100644 --- a/packages/gcc/10.3.0/0000-libtool-leave-framework-alone.patch +++ b/packages/gcc/10.3.0/0000-libtool-leave-framework-alone.patch @@ -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 diff --git a/packages/gcc/10.3.0/0001-uclibc-conf.patch b/packages/gcc/10.3.0/0001-uclibc-conf.patch index a9ae872..aef750a 100644 --- a/packages/gcc/10.3.0/0001-uclibc-conf.patch +++ b/packages/gcc/10.3.0/0001-uclibc-conf.patch @@ -4,7 +4,7 @@ --- a/contrib/regression/objs-gcc.sh +++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H +@@ -106,6 +106,10 @@ then make all-gdb all-dejagnu all-ld || exit 1 make install-gdb install-dejagnu install-ld || exit 1 diff --git a/packages/gcc/10.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/10.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch index 394dd49..ca9b8ba 100644 --- a/packages/gcc/10.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch +++ b/packages/gcc/10.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch @@ -6,7 +6,7 @@ --- a/config/gcc-plugin.m4 +++ b/config/gcc-plugin.m4 -@@ -21,6 +21,9 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -21,6 +21,9 @@ pluginlibs= plugin_check=yes @@ -16,7 +16,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -43,6 +46,11 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -43,6 +46,11 @@ export_sym_check= fi ;; @@ -28,7 +28,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -94,17 +102,17 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -94,17 +102,17 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` @@ -53,7 +53,7 @@ if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then --- a/gcc/configure +++ b/gcc/configure -@@ -30375,6 +30375,9 @@ fi +@@ -30385,6 +30385,9 @@ pluginlibs= plugin_check=yes @@ -63,7 +63,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -30397,6 +30400,11 @@ fi +@@ -30407,6 +30410,11 @@ export_sym_check= fi ;; @@ -75,7 +75,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -30509,23 +30517,23 @@ fi +@@ -30519,23 +30527,23 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` @@ -108,7 +108,7 @@ } --- a/libcc1/configure +++ b/libcc1/configure -@@ -14795,6 +14795,9 @@ fi +@@ -14812,6 +14812,9 @@ pluginlibs= plugin_check=yes @@ -118,7 +118,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -14817,6 +14820,11 @@ fi +@@ -14834,6 +14837,11 @@ export_sym_check= fi ;; @@ -130,7 +130,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -14929,23 +14937,23 @@ fi +@@ -14946,23 +14954,23 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` diff --git a/packages/gcc/10.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/10.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch index 3040e23..5f9a07a 100644 --- a/packages/gcc/10.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch +++ b/packages/gcc/10.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch @@ -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> diff --git a/packages/gcc/10.3.0/0005-fix-m68k-uclinux.patch b/packages/gcc/10.3.0/0005-fix-m68k-uclinux.patch index 9d176d3..452a4bb 100644 --- a/packages/gcc/10.3.0/0005-fix-m68k-uclinux.patch +++ b/packages/gcc/10.3.0/0005-fix-m68k-uclinux.patch @@ -10,7 +10,7 @@ Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -949,7 +949,7 @@ m68k*-*-netbsdelf*) +@@ -949,7 +949,7 @@ m68k*-*-openbsd*) ;; m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc diff --git a/packages/gcc/10.3.0/0006-libgfortran-missing-include.patch b/packages/gcc/10.3.0/0006-libgfortran-missing-include.patch index 866d2cc..d4917ee 100644 --- a/packages/gcc/10.3.0/0006-libgfortran-missing-include.patch +++ b/packages/gcc/10.3.0/0006-libgfortran-missing-include.patch @@ -4,7 +4,7 @@ --- a/libgfortran/io/close.c +++ b/libgfortran/io/close.c -@@ -29,6 +29,7 @@ see the files COPYING3 and COPYING.RUNTI +@@ -29,6 +29,7 @@ #if !HAVE_UNLINK_OPEN_FILE #include <string.h> #endif diff --git a/packages/gcc/10.3.0/0009-bionic-ndk.patch b/packages/gcc/10.3.0/0009-bionic-ndk.patch index 090172d..474dd8c 100644 --- a/packages/gcc/10.3.0/0009-bionic-ndk.patch +++ b/packages/gcc/10.3.0/0009-bionic-ndk.patch @@ -29,7 +29,7 @@ Date: Tue Apr 25 19:02:18 2017 -0700 namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -41,17 +53,17 @@ // NB: Offsets into ctype<char>::_M_table force a particular size // on the mask type. Because of this, we don't use an enum. typedef char mask; diff --git a/packages/gcc/10.3.0/0010-crystax.patch b/packages/gcc/10.3.0/0010-crystax.patch index 98bd2fe..5b15ffb 100644 --- a/packages/gcc/10.3.0/0010-crystax.patch +++ b/packages/gcc/10.3.0/0010-crystax.patch @@ -37,7 +37,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -1083,14 +1083,18 @@ aarch64*-*-netbsd*) +@@ -1113,14 +1113,18 @@ extra_options="${extra_options} netbsd.opt netbsd-elf.opt" ;; aarch64*-*-linux*) @@ -57,7 +57,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 esac aarch64_multilibs="${with_multilib_list}" if test "$aarch64_multilibs" = "default"; then -@@ -2501,6 +2505,17 @@ mips*-*-linux*) # Linux MIPS, either +@@ -2532,6 +2536,17 @@ tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h" extra_options="${extra_options} linux-android.opt" case ${target} in @@ -157,7 +157,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h -@@ -1974,12 +1974,13 @@ enum arm_auto_incmodes +@@ -1974,12 +1974,13 @@ #define CASE_VECTOR_PC_RELATIVE ((TARGET_THUMB2 \ || (TARGET_THUMB1 \ @@ -174,7 +174,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 : min >= -256 && max < 256 \ --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md -@@ -9342,7 +9342,7 @@ +@@ -9346,7 +9346,7 @@ (match_operand:SI 2 "const_int_operand") ; total range (match_operand:SI 3 "" "") ; table label (match_operand:SI 4 "" "")] ; Out of range label @@ -185,7 +185,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 enum insn_code code; --- a/gcc/config/arm/arm.opt +++ b/gcc/config/arm/arm.opt -@@ -202,6 +202,10 @@ mthumb-interwork +@@ -202,6 +202,10 @@ Target Report Mask(INTERWORK) Support calls between Thumb and ARM instruction sets. @@ -250,7 +250,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC, \ --- a/gcc/config/i386/gnu-user.h +++ b/gcc/config/i386/gnu-user.h -@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3. +@@ -65,9 +65,14 @@ When the -shared link option is used a final link is not being done. */ @@ -268,7 +268,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #define SUBTARGET_EXTRA_SPECS \ --- a/gcc/config/i386/gnu-user64.h +++ b/gcc/config/i386/gnu-user64.h -@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTI +@@ -46,6 +46,11 @@ #define SPEC_X32 "mx32" #endif @@ -282,7 +282,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 %{" SPEC_64 ":--64} \ --- a/gcc/config/i386/linux-common.h +++ b/gcc/config/i386/linux-common.h -@@ -36,7 +36,13 @@ along with GCC; see the file COPYING3. +@@ -36,7 +36,13 @@ #undef CC1_SPEC #define CC1_SPEC \ LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \ @@ -377,7 +377,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 + LINUX_DRIVER_SELF_SPECS --- a/gcc/config/mips/gnu-user.h +++ b/gcc/config/mips/gnu-user.h -@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. +@@ -36,6 +36,7 @@ /* The GNU C++ standard library requires this. */ \ if (c_dialect_cxx ()) \ builtin_define ("_GNU_SOURCE"); \ @@ -385,7 +385,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 } while (0) #undef SUBTARGET_CPP_SPEC -@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3. +@@ -71,7 +72,8 @@ #undef SUBTARGET_ASM_SPEC #define SUBTARGET_ASM_SPEC \ @@ -395,7 +395,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 /* The MIPS assembler has different syntax for .set. We set it to .dummy to trap any errors. */ -@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu +@@ -120,7 +122,7 @@ #endif #define LINUX_DRIVER_SELF_SPECS \ @@ -406,7 +406,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 specs handling by removing a redundant option. */ \ --- a/gcc/config/mips/linux-common.h +++ b/gcc/config/mips/linux-common.h -@@ -38,7 +38,7 @@ along with GCC; see the file COPYING3. +@@ -38,7 +38,7 @@ #undef SUBTARGET_CC1_SPEC #define SUBTARGET_CC1_SPEC \ LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \ @@ -430,7 +430,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6 --- a/libgcc/gthr-posix.h +++ b/libgcc/gthr-posix.h -@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTI +@@ -32,6 +32,19 @@ #define __GTHREADS 1 #define __GTHREADS_CXX0X 1 @@ -452,7 +452,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \ --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -74306,6 +74306,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ +@@ -73677,6 +73677,18 @@ #include <sys/syscall.h> #include <unistd.h> int lk; @@ -494,7 +494,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -@@ -1104,7 +1118,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1104,7 +1118,7 @@ * @return @a __hi. */ virtual const char* @@ -503,7 +503,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 { if (__builtin_expect(__hi != __lo, true)) __builtin_memcpy(__to, __lo, __hi - __lo); -@@ -1167,7 +1181,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1167,7 +1181,7 @@ private: void _M_narrow_init() const; diff --git a/packages/gcc/10.3.0/0012-crystax.patch b/packages/gcc/10.3.0/0012-crystax.patch index e7476ba..a61ec09 100644 --- a/packages/gcc/10.3.0/0012-crystax.patch +++ b/packages/gcc/10.3.0/0012-crystax.patch @@ -16,13 +16,12 @@ Date: Mon Apr 14 15:59:47 2014 -0700 gcc/config/freebsd.h | 4 +++ gcc/config/gnu-user.h | 4 +++ gcc/config/openbsd.h | 4 +++ - gcc/config/rs6000/sysv4.h | 6 ++++- gcc/config/sol2.h | 4 +++ gcc/configure | 36 +++++++++++++++++++++++++++++++++ gcc/configure.ac | 29 ++++++++++++++++++++++++++ gcc/testsuite/g++.dg/eh/spec3-static.C | 25 ++++++++++++++++++++++ libgcc/crtstuff.c | 11 ++++++---- - 11 files changed, 128 insertions(+), 5 deletions(-) + 10 files changed, 123 insertions(+), 4 deletions(-) --- a/gcc/config.in +++ b/gcc/config.in @@ -41,7 +40,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #ifndef USED_FOR_TARGET --- a/gcc/config/alpha/elf.h +++ b/gcc/config/alpha/elf.h -@@ -142,5 +142,9 @@ extern int alpha_this_gpdisp_sequence_nu +@@ -142,5 +142,9 @@ I imagine that other systems will catch up. In the meantime, it doesn't harm to make sure that the data exists to be used later. */ #if defined(HAVE_LD_EH_FRAME_HDR) @@ -53,7 +52,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 +#endif --- a/gcc/config/freebsd.h +++ b/gcc/config/freebsd.h -@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3. +@@ -45,8 +45,12 @@ #define LIB_SPEC FBSD_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -68,7 +67,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ --- a/gcc/config/gnu-user.h +++ b/gcc/config/gnu-user.h -@@ -106,8 +106,12 @@ see the files COPYING3 and COPYING.RUNTI +@@ -106,8 +106,12 @@ #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -83,7 +82,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 "%{static|static-pie:--start-group} %G %{!nolibc:%L} \ --- a/gcc/config/openbsd.h +++ b/gcc/config/openbsd.h -@@ -136,8 +136,12 @@ while (0) +@@ -136,8 +136,12 @@ #define LIB_SPEC OBSD_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -98,7 +97,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #define LIB_SPEC OBSD_LIB_SPEC --- a/gcc/config/sol2.h +++ b/gcc/config/sol2.h -@@ -434,7 +434,11 @@ along with GCC; see the file COPYING3. +@@ -434,7 +434,11 @@ /* Solaris 11 build 135+ implements dl_iterate_phdr. GNU ld needs --eh-frame-hdr to create the required .eh_frame_hdr sections. */ #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) @@ -112,7 +111,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --- a/gcc/configure +++ b/gcc/configure -@@ -1000,6 +1000,7 @@ enable_fix_cortex_a53_835769 +@@ -1000,6 +1000,7 @@ enable_fix_cortex_a53_843419 with_glibc_version enable_gnu_unique_object @@ -120,7 +119,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 enable_linker_build_id enable_libssp enable_default_ssp -@@ -1754,6 +1755,9 @@ Optional Features: +@@ -1754,6 +1755,9 @@ --enable-gnu-unique-object enable the use of the @gnu_unique_object ELF extension on glibc systems @@ -130,7 +129,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --enable-linker-build-id compiler will always pass --build-id to linker --enable-libssp enable linking against libssp -@@ -28836,6 +28840,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xye +@@ -28843,6 +28847,38 @@ $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h @@ -171,7 +170,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; } --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -5371,6 +5371,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HD +@@ -5376,6 +5376,35 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1, [Define if your linker supports .eh_frame_hdr.]) @@ -237,7 +236,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 +} --- a/libgcc/crtstuff.c +++ b/libgcc/crtstuff.c -@@ -88,7 +88,8 @@ call_ ## FUNC (void) \ +@@ -88,7 +88,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ @@ -247,7 +246,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(BSD_DL_ITERATE_PHDR_AVAILABLE) #include <link.h> # define USE_PT_GNU_EH_FRAME -@@ -97,7 +98,8 @@ call_ ## FUNC (void) \ +@@ -97,7 +98,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \ @@ -257,7 +256,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(__sun__) && defined(__svr4__) #include <link.h> # define USE_PT_GNU_EH_FRAME -@@ -106,7 +108,8 @@ call_ ## FUNC (void) \ +@@ -106,7 +108,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ @@ -267,7 +266,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(__GLIBC__) && __GLIBC__ >= 2 #include <link.h> /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h. -@@ -121,7 +124,7 @@ call_ ## FUNC (void) \ +@@ -121,7 +124,7 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ diff --git a/packages/gcc/10.3.0/0013-crystax.patch b/packages/gcc/10.3.0/0013-crystax.patch index 4414940..bf1bc1c 100644 --- a/packages/gcc/10.3.0/0013-crystax.patch +++ b/packages/gcc/10.3.0/0013-crystax.patch @@ -12,7 +12,7 @@ Date: Thu Aug 20 19:11:07 2015 +0300 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c -@@ -10344,6 +10344,7 @@ legitimate_pic_address_disp_p (rtx disp) +@@ -10340,6 +10340,7 @@ else if (!SYMBOL_REF_FAR_ADDR_P (op0) && (SYMBOL_REF_LOCAL_P (op0) || (HAVE_LD_PIE_COPYRELOC diff --git a/packages/gcc/10.3.0/0014-crystax.patch b/packages/gcc/10.3.0/0014-crystax.patch index 5acc6b9..8f2eb43 100644 --- a/packages/gcc/10.3.0/0014-crystax.patch +++ b/packages/gcc/10.3.0/0014-crystax.patch @@ -12,7 +12,7 @@ Date: Fri Aug 21 17:41:59 2015 +0300 --- a/libgcc/gthr.h +++ b/libgcc/gthr.h -@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTI +@@ -145,7 +145,11 @@ #define GTHREAD_USE_WEAK 1 #endif #endif diff --git a/packages/gcc/10.3.0/0015-crystax.patch b/packages/gcc/10.3.0/0015-crystax.patch index 1a4f6b3..4f1c28e 100644 --- a/packages/gcc/10.3.0/0015-crystax.patch +++ b/packages/gcc/10.3.0/0015-crystax.patch @@ -15,7 +15,7 @@ Date: Mon Apr 14 21:05:51 2014 -0700 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c -@@ -24077,9 +24077,13 @@ arm_print_operand (FILE *stream, rtx x, +@@ -24131,9 +24131,13 @@ memsize = MEM_SIZE (x); /* Only certain alignment specifiers are supported by the hardware. */ diff --git a/packages/gcc/10.3.0/0017-crystax.patch b/packages/gcc/10.3.0/0017-crystax.patch index 1a46aed..28284ff 100644 --- a/packages/gcc/10.3.0/0017-crystax.patch +++ b/packages/gcc/10.3.0/0017-crystax.patch @@ -24,7 +24,7 @@ Date: Tue Aug 25 09:36:42 2015 +0300 #endif /* GCC_AARCH64_LINUX_ANDROID_H */ --- a/gcc/config/mips/linux-common.h +++ b/gcc/config/mips/linux-common.h -@@ -65,3 +65,7 @@ along with GCC; see the file COPYING3. +@@ -65,3 +65,7 @@ /* The default value isn't sufficient in 64-bit mode. */ #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024) diff --git a/packages/gcc/10.3.0/0018-isl-0.20.patch b/packages/gcc/10.3.0/0018-isl-0.20.patch index de188b1..3e14966 100644 --- a/packages/gcc/10.3.0/0018-isl-0.20.patch +++ b/packages/gcc/10.3.0/0018-isl-0.20.patch @@ -15,7 +15,7 @@ Date: Mon Sep 24 22:50:11 2018 -0700 --- a/gcc/graphite.h +++ b/gcc/graphite.h -@@ -26,6 +26,8 @@ along with GCC; see the file COPYING3. +@@ -26,6 +26,8 @@ #include <isl/options.h> #include <isl/ctx.h> #include <isl/val.h> diff --git a/packages/gcc/10.3.0/0019-AArch64-Fix-build-issue-with-aarch64-builtins.c-on-M.patch b/packages/gcc/10.3.0/0019-AArch64-Fix-build-issue-with-aarch64-builtins.c-on-M.patch index a618707..0001169 100644 --- a/packages/gcc/10.3.0/0019-AArch64-Fix-build-issue-with-aarch64-builtins.c-on-M.patch +++ b/packages/gcc/10.3.0/0019-AArch64-Fix-build-issue-with-aarch64-builtins.c-on-M.patch @@ -13,14 +13,12 @@ Fix this by adding '-std=gnu++11' to the compile line. Signed-off-by: Kumar Gala <kumar.gala@linaro.org> --- - gcc/config/aarch64/t-aarch64 | 2 +- + gcc/config/aarch64/t-aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64 -index 11d20b7be14..d4c3154cf40 100644 --- a/gcc/config/aarch64/t-aarch64 +++ b/gcc/config/aarch64/t-aarch64 -@@ -41,7 +41,7 @@ aarch64-builtins.o: $(srcdir)/config/aarch64/aarch64-builtins.c $(CONFIG_H) \ +@@ -41,7 +41,7 @@ $(srcdir)/config/aarch64/aarch64-simd-builtins.def \ $(srcdir)/config/aarch64/aarch64-simd-builtin-types.def \ aarch64-builtin-iterators.h @@ -29,6 +27,3 @@ index 11d20b7be14..d4c3154cf40 100644 $(srcdir)/config/aarch64/aarch64-builtins.c aarch64-sve-builtins.o: $(srcdir)/config/aarch64/aarch64-sve-builtins.cc \ --- -2.25.4 - diff --git a/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch b/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch index da92ba3..7e3e6e6 100644 --- a/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch +++ b/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch @@ -28,17 +28,15 @@ libstdc++-v3/ChangeLog: * config.h.in: Regenerate. * configure: Regenerate. --- - libstdc++-v3/acinclude.m4 | 20 ++++++---- - libstdc++-v3/config.h.in | 3 ++ - libstdc++-v3/config/io/basic_file_stdio.cc | 46 +++++++++++++++++++--- - libstdc++-v3/configure | 17 +++++--- + libstdc++-v3/acinclude.m4 | 20 ++++++++---- + libstdc++-v3/config.h.in | 3 + + libstdc++-v3/config/io/basic_file_stdio.cc | 46 +++++++++++++++++++++++++---- + libstdc++-v3/configure | 17 +++++++--- 4 files changed, 69 insertions(+), 17 deletions(-) -diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 -index ee5e0336f2c..9604533c306 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 -@@ -2826,24 +2826,30 @@ AC_DEFUN([GLIBCXX_ENABLE_PARALLEL], [ +@@ -2797,24 +2797,30 @@ dnl @@ -76,11 +74,9 @@ index ee5e0336f2c..9604533c306 100644 ;; esac -diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in -index 8940e0c7acd..eabcf18b52b 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in -@@ -1031,6 +1031,9 @@ +@@ -974,6 +974,9 @@ /* Define if sendfile is available in <sys/sendfile.h>. */ #undef _GLIBCXX_USE_SENDFILE @@ -90,11 +86,9 @@ index 8940e0c7acd..eabcf18b52b 100644 /* Define if struct stat has timespec members. */ #undef _GLIBCXX_USE_ST_MTIM -diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc -index ba830fb9e97..eedffb017b6 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.cc +++ b/libstdc++-v3/config/io/basic_file_stdio.cc -@@ -111,13 +111,21 @@ namespace +@@ -111,13 +111,21 @@ // Wrapper handling partial write. static std::streamsize @@ -116,7 +110,7 @@ index ba830fb9e97..eedffb017b6 100644 if (__ret == -1L && errno == EINTR) continue; if (__ret == -1L) -@@ -133,7 +141,7 @@ namespace +@@ -133,7 +141,7 @@ return __n - __nleft; } @@ -125,7 +119,7 @@ index ba830fb9e97..eedffb017b6 100644 // Wrapper handling partial writev. static std::streamsize xwritev(int __fd, const char* __s1, std::streamsize __n1, -@@ -286,9 +294,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -286,9 +294,11 @@ __basic_file<char>::is_open() const throw () { return _M_cfile != 0; } @@ -137,7 +131,7 @@ index ba830fb9e97..eedffb017b6 100644 __c_file* __basic_file<char>::file() throw () -@@ -315,28 +325,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -315,29 +325,47 @@ { streamsize __ret; do @@ -182,11 +176,12 @@ index ba830fb9e97..eedffb017b6 100644 + __ret += xwrite(this->file(), __s2, __n2); +#else __ret += xwrite(this->fd(), __s2, __n2); -+#endif #endif ++#endif return __ret; } -@@ -350,7 +378,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + +@@ -350,8 +378,12 @@ if (__off > numeric_limits<off_t>::max() || __off < numeric_limits<off_t>::min()) return -1L; @@ -194,11 +189,12 @@ index ba830fb9e97..eedffb017b6 100644 + return fseek(this->file(), __off, __way); +#else return lseek(this->fd(), __off, __way); -+#endif #endif ++#endif } -@@ -361,7 +393,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + int +@@ -361,7 +393,7 @@ streamsize __basic_file<char>::showmanyc() { @@ -207,7 +203,7 @@ index ba830fb9e97..eedffb017b6 100644 #ifdef FIONREAD // Pipes and sockets. int __num = 0; -@@ -371,7 +403,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -371,7 +403,7 @@ #endif #endif @@ -216,7 +212,7 @@ index ba830fb9e97..eedffb017b6 100644 // Cheap test. struct pollfd __pfd[1]; __pfd[0].fd = this->fd(); -@@ -395,8 +427,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -395,9 +427,13 @@ struct stat __buffer; const int __err = fstat(this->fd(), &__buffer); if (!__err && _GLIBCXX_ISREG(__buffer.st_mode)) @@ -225,15 +221,14 @@ index ba830fb9e97..eedffb017b6 100644 +#else return __buffer.st_size - lseek(this->fd(), 0, ios_base::cur); #endif -+#endif #endif ++#endif return 0; } -diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index 9f9c5a2419a..50c8f00a41c 100755 + --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -16299,7 +16299,7 @@ $as_echo_n "checking for underlying I/O to use... " >&6; } +@@ -16301,7 +16301,7 @@ if test "${enable_cstdio+set}" = set; then : enableval=$enable_cstdio; case "$enableval" in @@ -242,7 +237,7 @@ index 9f9c5a2419a..50c8f00a41c 100755 *) as_fn_error $? "Unknown argument to enable/disable cstdio" "$LINENO" 5 ;; esac -@@ -16309,16 +16309,23 @@ fi +@@ -16311,16 +16311,23 @@ @@ -270,6 +265,3 @@ index 9f9c5a2419a..50c8f00a41c 100755 ;; esac --- -2.29.2 - diff --git a/packages/gcc/10.3.0/0021-Darwin-Arm64-Initial-support-for-the-self-host-drive.patch b/packages/gcc/10.3.0/0021-Darwin-Arm64-Initial-support-for-the-self-host-drive.patch index 12d99f8..dc63fe5 100644 --- a/packages/gcc/10.3.0/0021-Darwin-Arm64-Initial-support-for-the-self-host-drive.patch +++ b/packages/gcc/10.3.0/0021-Darwin-Arm64-Initial-support-for-the-self-host-drive.patch @@ -13,18 +13,16 @@ See commit 89dc5a9d5ed3e6b2ba6a4725bd51841ee758b6cd Its been backported to gcc-10.2 --- - gcc/config.host | 7 +++++- - gcc/config/aarch64/host-aarch64-darwin.c | 32 ++++++++++++++++++++++++ - gcc/config/aarch64/x-darwin | 3 +++ + gcc/config.host | 7 +++++- + gcc/config/aarch64/host-aarch64-darwin.c | 32 +++++++++++++++++++++++++++++++ + gcc/config/aarch64/x-darwin | 3 ++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gcc/config/aarch64/host-aarch64-darwin.c create mode 100644 gcc/config/aarch64/x-darwin -diff --git a/gcc/config.host b/gcc/config.host -index 84f0433e2ad..8489145e1b1 100644 --- a/gcc/config.host +++ b/gcc/config.host -@@ -99,7 +99,8 @@ case ${host} in +@@ -99,7 +99,8 @@ esac case ${host} in @@ -34,7 +32,7 @@ index 84f0433e2ad..8489145e1b1 100644 case ${target} in aarch64*-*-*) host_extra_gcc_objs="driver-aarch64.o" -@@ -251,6 +252,10 @@ case ${host} in +@@ -251,6 +252,10 @@ host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o" host_lto_plugin_soname=liblto_plugin-0.dll ;; @@ -45,9 +43,6 @@ index 84f0433e2ad..8489145e1b1 100644 i[34567]86-*-darwin* | x86_64-*-darwin*) out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o" host_xmake_file="${host_xmake_file} i386/x-darwin" -diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c -new file mode 100644 -index 00000000000..1a2cd4c9dab --- /dev/null +++ b/gcc/config/aarch64/host-aarch64-darwin.c @@ -0,0 +1,32 @@ @@ -83,15 +78,9 @@ index 00000000000..1a2cd4c9dab + exists just to include the generic config/host-darwin.h. */ + +const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; -diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin -new file mode 100644 -index 00000000000..6d788d5e89c --- /dev/null +++ b/gcc/config/aarch64/x-darwin @@ -0,0 +1,3 @@ +host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c + $(COMPILE) $< + $(POSTCOMPILE) --- -2.28.0 - diff --git a/packages/gcc/10.3.0/0023-Remove-use-of-include_next-from-c-headers.patch b/packages/gcc/10.3.0/0022-Remove-use-of-include_next-from-c-headers.patch index 47584c2..b32fe55 100644 --- a/packages/gcc/10.3.0/0023-Remove-use-of-include_next-from-c-headers.patch +++ b/packages/gcc/10.3.0/0022-Remove-use-of-include_next-from-c-headers.patch @@ -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.30.0 - |