snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

gcc: convert patches to -Np1

This commit is contained in:
Đoàn Trần Công Danh 2021-06-21 19:04:01 +07:00
parent 705839c8cc
commit 63b9d4b51f
11 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srcpkgs/gcc/patches/ada-shared.patch
View File

@ -1,5 +1,5 @@
--- gcc/ada/link.c --- a/gcc/ada/link.c
+++ gcc/ada/link.c +++ b/gcc/ada/link.c
@@ -105,9 +105,9 @@ @@ -105,9 +105,9 @@
#elif defined (__FreeBSD__) #elif defined (__FreeBSD__)

32
srcpkgs/gcc/patches/consistent-library-paths.patch
View File

@ -4,8 +4,8 @@ Do not change the dynamic linkers in any way, though.
When adding a new platform, fix this up too. When adding a new platform, fix this up too.
--- gcc/config/aarch64/t-aarch64-linux --- a/gcc/config/aarch64/t-aarch64-linux
+++ gcc/config/aarch64/t-aarch64-linux +++ b/gcc/config/aarch64/t-aarch64-linux
@@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm @@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm
LIB1ASMFUNCS = _aarch64_sync_cache_range 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) MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
--- gcc/config/i386/t-linux64 --- a/gcc/config/i386/t-linux64
+++ gcc/config/i386/t-linux64 +++ b/gcc/config/i386/t-linux64
@@ -33,6 +33,6 @@ @@ -33,6 +33,6 @@
comma=, comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) 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 = m64=../lib64
+MULTILIB_OSDIRNAMES+= m32=../lib32 +MULTILIB_OSDIRNAMES+= m32=../lib32
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
--- gcc/config/mips/t-linux64 --- a/gcc/config/mips/t-linux64
+++ gcc/config/mips/t-linux64 +++ b/gcc/config/mips/t-linux64
@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64 @@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) 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) 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 \ + ../lib32 \
+ ../lib \ + ../lib \
+ ../lib64 + ../lib64
--- gcc/config/rs6000/t-linux --- a/gcc/config/rs6000/t-linux
+++ gcc/config/rs6000/t-linux +++ b/gcc/config/rs6000/t-linux
@@ -2,7 +2,8 @@ @@ -2,7 +2,8 @@
# or soft-float. # or soft-float.
ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_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
endif endif
--- gcc/config/rs6000/t-linux64 --- a/gcc/config/rs6000/t-linux64
+++ gcc/config/rs6000/t-linux64 +++ b/gcc/config/rs6000/t-linux64
@@ -28,8 +28,8 @@ @@ -28,8 +28,8 @@
MULTILIB_OPTIONS := m64/m32 MULTILIB_OPTIONS := m64/m32
MULTILIB_DIRNAMES := 64 32 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 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
$(COMPILE) $< $(COMPILE) $<
--- gcc/config/rs6000/t-linux64bele --- a/gcc/config/rs6000/t-linux64bele
+++ gcc/config/rs6000/t-linux64bele +++ b/gcc/config/rs6000/t-linux64bele
@@ -2,6 +2,6 @@ @@ -2,6 +2,6 @@
MULTILIB_OPTIONS += mlittle MULTILIB_OPTIONS += mlittle
@ -84,8 +84,8 @@ When adding a new platform, fix this up too.
+MULTILIB_OSDIRNAMES = m64=../lib64 +MULTILIB_OSDIRNAMES = m64=../lib64
+MULTILIB_OSDIRNAMES+= m32=../lib32 +MULTILIB_OSDIRNAMES+= m32=../lib32
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
--- gcc/config/rs6000/t-linux64lebe --- a/gcc/config/rs6000/t-linux64lebe
+++ gcc/config/rs6000/t-linux64lebe +++ b/gcc/config/rs6000/t-linux64lebe
@@ -2,6 +2,6 @@ @@ -2,6 +2,6 @@
MULTILIB_OPTIONS += mbig MULTILIB_OPTIONS += mbig
@ -95,8 +95,8 @@ When adding a new platform, fix this up too.
+MULTILIB_OSDIRNAMES := m64=../lib64 +MULTILIB_OSDIRNAMES := m64=../lib64
+MULTILIB_OSDIRNAMES += m32=../lib32 +MULTILIB_OSDIRNAMES += m32=../lib32
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
--- gcc/config/s390/t-linux64 --- a/gcc/config/s390/t-linux64
+++ gcc/config/s390/t-linux64 +++ b/gcc/config/s390/t-linux64
@@ -7,5 +7,5 @@ @@ -7,5 +7,5 @@
MULTILIB_OPTIONS = m64/m31 MULTILIB_OPTIONS = m64/m31

4
srcpkgs/gcc/patches/fix-cxxflags-passing.patch
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig --- a/Makefile.in
+++ Makefile.in +++ b/Makefile.in
@@ -169,6 +169,7 @@ @@ -169,6 +169,7 @@
# built for the build system to override those in BASE_FLAGS_TO_PASSS. # built for the build system to override those in BASE_FLAGS_TO_PASSS.
EXTRA_BUILD_FLAGS = \ EXTRA_BUILD_FLAGS = \

8
srcpkgs/gcc/patches/fix-musl-execinfo.patch
View File

@ -1,7 +1,7 @@
There is no <execinfo.h> in musl libc There is no <execinfo.h> in musl libc
--- libvtv/vtv_rts.cc 2016-09-23 16:17:11.000000000 +0200 --- a/libvtv/vtv_rts.cc 2016-09-23 16:17:11.000000000 +0200
+++ libvtc/vtv_rts.cc 2016-09-25 15:08:57.896000000 +0200 +++ b/libvtc/vtv_rts.cc 2016-09-25 15:08:57.896000000 +0200
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
#include <windows.h> #include <windows.h>
#include <winternl.h> #include <winternl.h>
@ -11,8 +11,8 @@ There is no <execinfo.h> in musl libc
#include <execinfo.h> #include <execinfo.h>
#endif #endif
--- libvtv/vtv_utils.cc 2016-09-23 16:17:11.000000000 +0200 --- a/libvtv/vtv_utils.cc 2016-09-23 16:17:11.000000000 +0200
+++ libvtv/vtv_utils.cc 2016-09-25 15:15:35.529000000 +0200 +++ b/libvtv/vtv_utils.cc 2016-09-25 15:15:35.529000000 +0200
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
#include <string.h> #include <string.h>
#if defined (__CYGWIN__) || defined (__MINGW32__) #if defined (__CYGWIN__) || defined (__MINGW32__)

4
srcpkgs/gcc/patches/fix-vtv-link-order.patch
View File

@ -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, after crtbegin.o) it also inserts vtv_end.o into the link line,
just before crtend.o. just before crtend.o.
--- libstdc++-v3/configure --- a/libstdc++-v3/configure
+++ libstdc++-v3/configure +++ b/libstdc++-v3/configure
@@ -15443,7 +15443,7 @@ @@ -15443,7 +15443,7 @@
if test "$enable_vtable_verify" = yes; then if test "$enable_vtable_verify" = yes; then

4
srcpkgs/gcc/patches/libffi_gnulinux.patch
View File

@ -1,5 +1,5 @@
--- libffi/src/closures.c.orig --- a/libffi/src/closures.c
+++ libffi/src/closures.c +++ b/libffi/src/closures.c
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
#include <ffi_common.h> #include <ffi_common.h>

8
srcpkgs/gcc/patches/libgcc-ibm128-no-tag.patch
View File

@ -15,8 +15,8 @@ explicit __ibm128.
diff --git a/libgcc/config/rs6000/t-ibm-ldouble b/libgcc/config/rs6000/t-ibm-ldouble diff --git a/libgcc/config/rs6000/t-ibm-ldouble b/libgcc/config/rs6000/t-ibm-ldouble
index b132784..fb5eca8 100644 index b132784..fb5eca8 100644
--- libgcc/config/rs6000/t-ibm-ldouble --- a/libgcc/config/rs6000/t-ibm-ldouble
+++ libgcc/config/rs6000/t-ibm-ldouble +++ b/libgcc/config/rs6000/t-ibm-ldouble
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
# GCC 128-bit long double support routines. # GCC 128-bit long double support routines.
LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c
@ -27,8 +27,8 @@ index b132784..fb5eca8 100644
SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ibm-ldouble.ver SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ibm-ldouble.ver
diff --git a/libgcc/config/rs6000/t-linux b/libgcc/config/rs6000/t-linux diff --git a/libgcc/config/rs6000/t-linux b/libgcc/config/rs6000/t-linux
index 4f6d4c4..fa93bb6 100644 index 4f6d4c4..fa93bb6 100644
--- libgcc/config/rs6000/t-linux --- a/libgcc/config/rs6000/t-linux
+++ libgcc/config/rs6000/t-linux +++ b/libgcc/config/rs6000/t-linux
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-glibc.ver SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-glibc.ver

4
srcpkgs/gcc/patches/mips-sgidefs_h.patch
View File

@ -1,5 +1,5 @@
--- libffi/src/mips/ffitarget.h 2014-11-08 13:47:24.000000000 +0100 --- a/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 +++ b/libffi/src/mips/ffitarget.h 2017-11-09 16:51:11.866848444 +0100
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
#define _MIPS_SIM_NABI32 2 #define _MIPS_SIM_NABI32 2
#define _MIPS_SIM_ABI64 3 #define _MIPS_SIM_ABI64 3

4
srcpkgs/gcc/patches/mips-soft-float.patch
View File

@ -1,5 +1,5 @@
--- libffi/src/mips/o32.S 2020-03-12 12:07:23.000000000 +0100 --- a/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 +++ b/libffi/src/mips/o32.S 2020-05-14 20:52:45.701809054 +0200
@@ -278,6 +278,7 @@ @@ -278,6 +278,7 @@
li $9, FFI_TYPE_VOID li $9, FFI_TYPE_VOID
beq $8, $9, closure_done beq $8, $9, closure_done

16
srcpkgs/gcc/patches/musl-ada.patch
View File

@ -1,7 +1,7 @@
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 3b0aea9..ee0bb69 100644 index 3b0aea9..ee0bb69 100644
--- gcc/ada/adaint.c --- a/gcc/ada/adaint.c
+++ gcc/ada/adaint.c +++ b/gcc/ada/adaint.c
@@ -76,6 +76,11 @@ @@ -76,6 +76,11 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/pstat.h> #include <sys/pstat.h>
@ -104,8 +104,8 @@ index 3b0aea9..ee0bb69 100644
#endif /* __linux__ */ #endif /* __linux__ */
diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
index 0d12f7e..a063b47 100644 index 0d12f7e..a063b47 100644
--- gcc/ada/adaint.h --- a/gcc/ada/adaint.h
+++ gcc/ada/adaint.h +++ b/gcc/ada/adaint.h
@@ -316,13 +316,11 @@ extern void *__gnat_lwp_self (void); @@ -316,13 +316,11 @@ extern void *__gnat_lwp_self (void);
/* Routines for interface to required CPU set primitives */ /* Routines for interface to required CPU set primitives */
@ -124,8 +124,8 @@ index 0d12f7e..a063b47 100644
#endif #endif
#if defined (_WIN32) #if defined (_WIN32)
--- gcc/ada/Makefile.rtl 2020-07-23 08:35:17.052381336 +0200 --- a/gcc/ada/Makefile.rtl 2020-07-23 08:35:17.052381336 +0200
+++ - 2020-08-09 19:38:24.230351406 +0200 +++ b/gcc/ada/Makefile.rtl 2020-07-23 08:35:17.052381336 +0200
@@ -1533,7 +1533,7 @@ @@ -1533,7 +1533,7 @@
s-intman.adb<libgnarl/s-intman__posix.adb \ s-intman.adb<libgnarl/s-intman__posix.adb \
s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \ s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
@ -171,8 +171,8 @@ index 0d12f7e..a063b47 100644
$(ATOMICS_TARGET_PAIRS) \ $(ATOMICS_TARGET_PAIRS) \
$(X86_64_TARGET_PAIRS) \ $(X86_64_TARGET_PAIRS) \
system.ads<libgnat/system-linux-x86.ads system.ads<libgnat/system-linux-x86.ads
--- gcc/ada/terminals.c 2019-01-08 10:54:04.000000000 +0100 --- a/gcc/ada/terminals.c 2019-01-08 10:54:04.000000000 +0100
+++ gcc/ada/terminals.c 2019-05-15 13:14:09.935742526 +0200 +++ b/gcc/ada/terminals.c 2019-05-15 13:14:09.935742526 +0200
@@ -1136,7 +1136,7 @@ @@ -1136,7 +1136,7 @@
/* POSIX does not specify how to open the master side of a terminal.Several /* POSIX does not specify how to open the master side of a terminal.Several
methods are available (system specific): methods are available (system specific):

4
srcpkgs/gcc/patches/musl-generic-locale.patch
View File

@ -2,8 +2,8 @@ See
https://inbox.vuxu.org/musl/551d3310-039f-23c4-608e-5e15e625f638@sholland.org/ https://inbox.vuxu.org/musl/551d3310-039f-23c4-608e-5e15e625f638@sholland.org/
diff --git gcc-5.4.0/libstdc++-v3/config/locale/generic/c_locale.cc.orig gcc-5.4.0/libstdc++-v3/config/locale/generic/c_locale.cc diff --git gcc-5.4.0/libstdc++-v3/config/locale/generic/c_locale.cc.orig gcc-5.4.0/libstdc++-v3/config/locale/generic/c_locale.cc
--- libstdc++-v3/config/locale/generic/c_locale.cc.orig --- a/libstdc++-v3/config/locale/generic/c_locale.cc
+++ libstdc++-v3/config/locale/generic/c_locale.cc +++ b/libstdc++-v3/config/locale/generic/c_locale.cc
@@ -213,9 +213,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -213,9 +213,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Currently, the generic model only supports the "C" locale. // Currently, the generic model only supports the "C" locale.
// See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html // See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html