From 63b9d4b51fa1d8c3b9d10ced6bd31d2d06542a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 21 Jun 2021 19:04:01 +0700 Subject: [PATCH] gcc: convert patches to -Np1 --- srcpkgs/gcc/patches/ada-shared.patch | 4 +-- .../patches/consistent-library-paths.patch | 32 +++++++++---------- .../gcc/patches/fix-cxxflags-passing.patch | 4 +-- srcpkgs/gcc/patches/fix-musl-execinfo.patch | 8 ++--- srcpkgs/gcc/patches/fix-vtv-link-order.patch | 4 +-- srcpkgs/gcc/patches/libffi_gnulinux.patch | 4 +-- .../gcc/patches/libgcc-ibm128-no-tag.patch | 8 ++--- srcpkgs/gcc/patches/mips-sgidefs_h.patch | 4 +-- srcpkgs/gcc/patches/mips-soft-float.patch | 4 +-- srcpkgs/gcc/patches/musl-ada.patch | 16 +++++----- srcpkgs/gcc/patches/musl-generic-locale.patch | 4 +-- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/srcpkgs/gcc/patches/ada-shared.patch b/srcpkgs/gcc/patches/ada-shared.patch index 7b4280620f..01b23d3228 100644 --- a/srcpkgs/gcc/patches/ada-shared.patch +++ b/srcpkgs/gcc/patches/ada-shared.patch @@ -1,5 +1,5 @@ ---- gcc/ada/link.c -+++ gcc/ada/link.c +--- a/gcc/ada/link.c ++++ b/gcc/ada/link.c @@ -105,9 +105,9 @@ #elif defined (__FreeBSD__) diff --git a/srcpkgs/gcc/patches/consistent-library-paths.patch b/srcpkgs/gcc/patches/consistent-library-paths.patch index 1ec0e25852..333dc53a4e 100644 --- a/srcpkgs/gcc/patches/consistent-library-paths.patch +++ b/srcpkgs/gcc/patches/consistent-library-paths.patch @@ -4,8 +4,8 @@ Do not change the dynamic linkers in any way, though. When adding a new platform, fix this up too. ---- gcc/config/aarch64/t-aarch64-linux -+++ gcc/config/aarch64/t-aarch64-linux +--- a/gcc/config/aarch64/t-aarch64-linux ++++ b/gcc/config/aarch64/t-aarch64-linux @@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm LIB1ASMFUNCS = _aarch64_sync_cache_range @@ -15,8 +15,8 @@ When adding a new platform, fix this up too. MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) ---- gcc/config/i386/t-linux64 -+++ gcc/config/i386/t-linux64 +--- a/gcc/config/i386/t-linux64 ++++ b/gcc/config/i386/t-linux64 @@ -33,6 +33,6 @@ comma=, MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) @@ -26,8 +26,8 @@ When adding a new platform, fix this up too. +MULTILIB_OSDIRNAMES = m64=../lib64 +MULTILIB_OSDIRNAMES+= m32=../lib32 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) ---- gcc/config/mips/t-linux64 -+++ gcc/config/mips/t-linux64 +--- a/gcc/config/mips/t-linux64 ++++ b/gcc/config/mips/t-linux64 @@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64 MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) @@ -38,8 +38,8 @@ When adding a new platform, fix this up too. + ../lib32 \ + ../lib \ + ../lib64 ---- gcc/config/rs6000/t-linux -+++ gcc/config/rs6000/t-linux +--- a/gcc/config/rs6000/t-linux ++++ b/gcc/config/rs6000/t-linux @@ -2,7 +2,8 @@ # or soft-float. ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) @@ -60,8 +60,8 @@ When adding a new platform, fix this up too. endif endif ---- gcc/config/rs6000/t-linux64 -+++ gcc/config/rs6000/t-linux64 +--- a/gcc/config/rs6000/t-linux64 ++++ b/gcc/config/rs6000/t-linux64 @@ -28,8 +28,8 @@ MULTILIB_OPTIONS := m64/m32 MULTILIB_DIRNAMES := 64 32 @@ -73,8 +73,8 @@ When adding a new platform, fix this up too. rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c $(COMPILE) $< ---- gcc/config/rs6000/t-linux64bele -+++ gcc/config/rs6000/t-linux64bele +--- a/gcc/config/rs6000/t-linux64bele ++++ b/gcc/config/rs6000/t-linux64bele @@ -2,6 +2,6 @@ MULTILIB_OPTIONS += mlittle @@ -84,8 +84,8 @@ When adding a new platform, fix this up too. +MULTILIB_OSDIRNAMES = m64=../lib64 +MULTILIB_OSDIRNAMES+= m32=../lib32 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} ---- gcc/config/rs6000/t-linux64lebe -+++ gcc/config/rs6000/t-linux64lebe +--- a/gcc/config/rs6000/t-linux64lebe ++++ b/gcc/config/rs6000/t-linux64lebe @@ -2,6 +2,6 @@ MULTILIB_OPTIONS += mbig @@ -95,8 +95,8 @@ When adding a new platform, fix this up too. +MULTILIB_OSDIRNAMES := m64=../lib64 +MULTILIB_OSDIRNAMES += m32=../lib32 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} ---- gcc/config/s390/t-linux64 -+++ gcc/config/s390/t-linux64 +--- a/gcc/config/s390/t-linux64 ++++ b/gcc/config/s390/t-linux64 @@ -7,5 +7,5 @@ MULTILIB_OPTIONS = m64/m31 diff --git a/srcpkgs/gcc/patches/fix-cxxflags-passing.patch b/srcpkgs/gcc/patches/fix-cxxflags-passing.patch index dda2a50460..d03974013f 100644 --- a/srcpkgs/gcc/patches/fix-cxxflags-passing.patch +++ b/srcpkgs/gcc/patches/fix-cxxflags-passing.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -169,6 +169,7 @@ # built for the build system to override those in BASE_FLAGS_TO_PASSS. EXTRA_BUILD_FLAGS = \ diff --git a/srcpkgs/gcc/patches/fix-musl-execinfo.patch b/srcpkgs/gcc/patches/fix-musl-execinfo.patch index 583eac7b0d..543316638b 100644 --- a/srcpkgs/gcc/patches/fix-musl-execinfo.patch +++ b/srcpkgs/gcc/patches/fix-musl-execinfo.patch @@ -1,7 +1,7 @@ There is no in musl libc ---- libvtv/vtv_rts.cc 2016-09-23 16:17:11.000000000 +0200 -+++ libvtc/vtv_rts.cc 2016-09-25 15:08:57.896000000 +0200 +--- a/libvtv/vtv_rts.cc 2016-09-23 16:17:11.000000000 +0200 ++++ b/libvtc/vtv_rts.cc 2016-09-25 15:08:57.896000000 +0200 @@ -124,7 +124,7 @@ #include #include @@ -11,8 +11,8 @@ There is no in musl libc #include #endif ---- libvtv/vtv_utils.cc 2016-09-23 16:17:11.000000000 +0200 -+++ libvtv/vtv_utils.cc 2016-09-25 15:15:35.529000000 +0200 +--- a/libvtv/vtv_utils.cc 2016-09-23 16:17:11.000000000 +0200 ++++ b/libvtv/vtv_utils.cc 2016-09-25 15:15:35.529000000 +0200 @@ -34,7 +34,7 @@ #include #if defined (__CYGWIN__) || defined (__MINGW32__) diff --git a/srcpkgs/gcc/patches/fix-vtv-link-order.patch b/srcpkgs/gcc/patches/fix-vtv-link-order.patch index 3315c3e990..4925ed5aa6 100644 --- a/srcpkgs/gcc/patches/fix-vtv-link-order.patch +++ b/srcpkgs/gcc/patches/fix-vtv-link-order.patch @@ -7,8 +7,8 @@ This is in line with comment in libgcc/vtv_end.c: after crtbegin.o) it also inserts vtv_end.o into the link line, just before crtend.o. ---- libstdc++-v3/configure -+++ libstdc++-v3/configure +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure @@ -15443,7 +15443,7 @@ if test "$enable_vtable_verify" = yes; then diff --git a/srcpkgs/gcc/patches/libffi_gnulinux.patch b/srcpkgs/gcc/patches/libffi_gnulinux.patch index 413b4aef5a..98245bd5be 100644 --- a/srcpkgs/gcc/patches/libffi_gnulinux.patch +++ b/srcpkgs/gcc/patches/libffi_gnulinux.patch @@ -1,5 +1,5 @@ ---- libffi/src/closures.c.orig -+++ libffi/src/closures.c +--- a/libffi/src/closures.c ++++ b/libffi/src/closures.c @@ -34,7 +34,7 @@ #include diff --git a/srcpkgs/gcc/patches/libgcc-ibm128-no-tag.patch b/srcpkgs/gcc/patches/libgcc-ibm128-no-tag.patch index 855f8f1b03..bdf5c75d91 100644 --- a/srcpkgs/gcc/patches/libgcc-ibm128-no-tag.patch +++ b/srcpkgs/gcc/patches/libgcc-ibm128-no-tag.patch @@ -15,8 +15,8 @@ explicit __ibm128. diff --git a/libgcc/config/rs6000/t-ibm-ldouble b/libgcc/config/rs6000/t-ibm-ldouble index b132784..fb5eca8 100644 ---- libgcc/config/rs6000/t-ibm-ldouble -+++ libgcc/config/rs6000/t-ibm-ldouble +--- a/libgcc/config/rs6000/t-ibm-ldouble ++++ b/libgcc/config/rs6000/t-ibm-ldouble @@ -1,6 +1,6 @@ # GCC 128-bit long double support routines. LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c @@ -27,8 +27,8 @@ index b132784..fb5eca8 100644 SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ibm-ldouble.ver diff --git a/libgcc/config/rs6000/t-linux b/libgcc/config/rs6000/t-linux index 4f6d4c4..fa93bb6 100644 ---- libgcc/config/rs6000/t-linux -+++ libgcc/config/rs6000/t-linux +--- a/libgcc/config/rs6000/t-linux ++++ b/libgcc/config/rs6000/t-linux @@ -1,3 +1,3 @@ SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-glibc.ver diff --git a/srcpkgs/gcc/patches/mips-sgidefs_h.patch b/srcpkgs/gcc/patches/mips-sgidefs_h.patch index e5fdbf9f96..dddfe10e8c 100644 --- a/srcpkgs/gcc/patches/mips-sgidefs_h.patch +++ b/srcpkgs/gcc/patches/mips-sgidefs_h.patch @@ -1,5 +1,5 @@ ---- libffi/src/mips/ffitarget.h 2014-11-08 13:47:24.000000000 +0100 -+++ libffi/src/mips/ffitarget.h 2017-11-09 16:51:11.866848444 +0100 +--- a/libffi/src/mips/ffitarget.h 2014-11-08 13:47:24.000000000 +0100 ++++ b/libffi/src/mips/ffitarget.h 2017-11-09 16:51:11.866848444 +0100 @@ -42,7 +42,7 @@ #define _MIPS_SIM_NABI32 2 #define _MIPS_SIM_ABI64 3 diff --git a/srcpkgs/gcc/patches/mips-soft-float.patch b/srcpkgs/gcc/patches/mips-soft-float.patch index 4db0e2fb07..a954e3df73 100644 --- a/srcpkgs/gcc/patches/mips-soft-float.patch +++ b/srcpkgs/gcc/patches/mips-soft-float.patch @@ -1,5 +1,5 @@ ---- libffi/src/mips/o32.S 2020-03-12 12:07:23.000000000 +0100 -+++ libffi/src/mips/o32.S 2020-05-14 20:52:45.701809054 +0200 +--- a/libffi/src/mips/o32.S 2020-03-12 12:07:23.000000000 +0100 ++++ b/libffi/src/mips/o32.S 2020-05-14 20:52:45.701809054 +0200 @@ -278,6 +278,7 @@ li $9, FFI_TYPE_VOID beq $8, $9, closure_done diff --git a/srcpkgs/gcc/patches/musl-ada.patch b/srcpkgs/gcc/patches/musl-ada.patch index 61823684da..c2c79df0ad 100644 --- a/srcpkgs/gcc/patches/musl-ada.patch +++ b/srcpkgs/gcc/patches/musl-ada.patch @@ -1,7 +1,7 @@ diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 3b0aea9..ee0bb69 100644 ---- gcc/ada/adaint.c -+++ gcc/ada/adaint.c +--- a/gcc/ada/adaint.c ++++ b/gcc/ada/adaint.c @@ -76,6 +76,11 @@ #include #include @@ -104,8 +104,8 @@ index 3b0aea9..ee0bb69 100644 #endif /* __linux__ */ diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h index 0d12f7e..a063b47 100644 ---- gcc/ada/adaint.h -+++ gcc/ada/adaint.h +--- a/gcc/ada/adaint.h ++++ b/gcc/ada/adaint.h @@ -316,13 +316,11 @@ extern void *__gnat_lwp_self (void); /* Routines for interface to required CPU set primitives */ @@ -124,8 +124,8 @@ index 0d12f7e..a063b47 100644 #endif #if defined (_WIN32) ---- gcc/ada/Makefile.rtl 2020-07-23 08:35:17.052381336 +0200 -+++ - 2020-08-09 19:38:24.230351406 +0200 +--- a/gcc/ada/Makefile.rtl 2020-07-23 08:35:17.052381336 +0200 ++++ b/gcc/ada/Makefile.rtl 2020-07-23 08:35:17.052381336 +0200 @@ -1533,7 +1533,7 @@ s-intman.adb