diff --git a/srcpkgs/cross-aarch64-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-aarch64-linux-gnu/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-aarch64-linux-gnu/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-gnu/files/use-pure-64bit-configs.patch b/srcpkgs/cross-aarch64-linux-gnu/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-aarch64-linux-gnu/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index f4f2fb518a0..b417b0fbbd3 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -104,8 +104,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-aarch64-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-aarch64-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-aarch64-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-aarch64-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/musl-ada.patch b/srcpkgs/cross-aarch64-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/use-pure-64bit-configs.patch b/srcpkgs/cross-aarch64-linux-musl/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 48d3c201d06..5fc74dae613 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -90,13 +90,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-arm-linux-gnueabi/files/fix-cxxflags-passing.patch b/srcpkgs/cross-arm-linux-gnueabi/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-arm-linux-gnueabi/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 427a22b19c5..7dcc295aac3 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -103,7 +103,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-arm-linux-gnueabihf/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 7a92cfa248f..64f85b7b9f6 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -104,7 +104,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/fix-cxxflags-passing.patch b/srcpkgs/cross-arm-linux-musleabi/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch b/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/invalid_tls_model.patch b/srcpkgs/cross-arm-linux-musleabi/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/libgnarl-musl.patch b/srcpkgs/cross-arm-linux-musleabi/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/libssp-musl.patch b/srcpkgs/cross-arm-linux-musleabi/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/musl-ada.patch b/srcpkgs/cross-arm-linux-musleabi/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index fb7d294df48..7e476836a6e 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -90,12 +90,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-arm-linux-musleabihf/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-arm-linux-musleabihf/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch b/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/invalid_tls_model.patch b/srcpkgs/cross-arm-linux-musleabihf/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-arm-linux-musleabihf/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/libgnarl-musl.patch b/srcpkgs/cross-arm-linux-musleabihf/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-arm-linux-musleabihf/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/libssp-musl.patch b/srcpkgs/cross-arm-linux-musleabihf/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-arm-linux-musleabihf/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/musl-ada.patch b/srcpkgs/cross-arm-linux-musleabihf/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-arm-linux-musleabihf/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 77fb27fe5db..7580fb2a9d8 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -90,12 +90,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 66c34d29325..700645a15b0 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -104,7 +104,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-armv7l-linux-musleabihf/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/invalid_tls_model.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-armv7l-linux-musleabihf/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/libgnarl-musl.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-armv7l-linux-musleabihf/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/libssp-musl.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-armv7l-linux-musleabihf/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/musl-ada.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-armv7l-linux-musleabihf/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index b29d69de9b2..59c5a00ced4 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -90,12 +90,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-i686-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-i686-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-i686-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-i686-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-i686-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/musl-ada.patch b/srcpkgs/cross-i686-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index af40ec66455..d613486ee04 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -88,12 +88,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-i686-pc-linux-gnu/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 3e5c3f5881a..e543269ccb7 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -87,7 +87,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-mips-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-mips-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-mips-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-mips-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-mips-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-mips-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-mips-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-mips-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-mips-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-musl/files/musl-ada.patch b/srcpkgs/cross-mips-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-mips-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index bc8b15ac541..da251874668 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -83,11 +83,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-mips-linux-muslhf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-mips-linux-muslhf/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-mips-linux-muslhf/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-muslhf/files/invalid_tls_model.patch b/srcpkgs/cross-mips-linux-muslhf/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-mips-linux-muslhf/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-muslhf/files/libgnarl-musl.patch b/srcpkgs/cross-mips-linux-muslhf/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-mips-linux-muslhf/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-muslhf/files/libssp-musl.patch b/srcpkgs/cross-mips-linux-muslhf/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-mips-linux-muslhf/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-muslhf/files/musl-ada.patch b/srcpkgs/cross-mips-linux-muslhf/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-mips-linux-muslhf/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 4f3bc67aa80..b5d6ec947e9 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -83,11 +83,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-mipsel-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-mipsel-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-mipsel-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-mipsel-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-mipsel-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-mipsel-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-mipsel-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-mipsel-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-mipsel-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-musl/files/musl-ada.patch b/srcpkgs/cross-mipsel-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-mipsel-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 48a0027d4eb..121143b9601 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -83,11 +83,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-mipsel-linux-muslhf/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/invalid_tls_model.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-mipsel-linux-muslhf/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/libgnarl-musl.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-mipsel-linux-muslhf/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/libssp-musl.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-mipsel-linux-muslhf/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/musl-ada.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-mipsel-linux-muslhf/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index e639bf043d7..942a1359fa5 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -83,11 +83,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpc-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-powerpc-linux-gnu/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-powerpc-linux-gnu/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-gnu/files/libgcc-ibm128-no-tag.patch b/srcpkgs/cross-powerpc-linux-gnu/files/libgcc-ibm128-no-tag.patch
deleted file mode 120000
index ce268dbe9b2..00000000000
--- a/srcpkgs/cross-powerpc-linux-gnu/files/libgcc-ibm128-no-tag.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libgcc-ibm128-no-tag.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 7c5231736d7..8ed11276162 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -100,8 +100,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/0010-ldbl128-config.patch b/srcpkgs/cross-powerpc-linux-musl/files/0010-ldbl128-config.patch
deleted file mode 120000
index 02d68e45a47..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/0010-ldbl128-config.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/0010-ldbl128-config.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-powerpc-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-powerpc-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/libgcc-ibm128-no-tag.patch b/srcpkgs/cross-powerpc-linux-musl/files/libgcc-ibm128-no-tag.patch
deleted file mode 120000
index ce268dbe9b2..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/libgcc-ibm128-no-tag.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libgcc-ibm128-no-tag.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-powerpc-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-powerpc-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/musl-ada.patch b/srcpkgs/cross-powerpc-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index fc7ca0cb7bf..d352f9df97b 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -89,14 +89,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
-	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-powerpc64-linux-gnu/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/libgcc-ibm128-no-tag.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/libgcc-ibm128-no-tag.patch
deleted file mode 120000
index ce268dbe9b2..00000000000
--- a/srcpkgs/cross-powerpc64-linux-gnu/files/libgcc-ibm128-no-tag.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libgcc-ibm128-no-tag.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/use-pure-64bit-configs.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-powerpc64-linux-gnu/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 7f5394c880f..5ad02f4a243 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -91,9 +91,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/0010-ldbl128-config.patch b/srcpkgs/cross-powerpc64-linux-musl/files/0010-ldbl128-config.patch
deleted file mode 120000
index 02d68e45a47..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/0010-ldbl128-config.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/0010-ldbl128-config.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-powerpc64-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-powerpc64-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/libgcc-ibm128-no-tag.patch b/srcpkgs/cross-powerpc64-linux-musl/files/libgcc-ibm128-no-tag.patch
deleted file mode 120000
index ce268dbe9b2..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/libgcc-ibm128-no-tag.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libgcc-ibm128-no-tag.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-powerpc64-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-powerpc64-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/musl-ada.patch b/srcpkgs/cross-powerpc64-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/use-pure-64bit-configs.patch b/srcpkgs/cross-powerpc64-linux-musl/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index ed9adc5861e..0038e7c0b29 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -90,15 +90,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
-	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-gnu/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/libgcc-ibm128-no-tag.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/libgcc-ibm128-no-tag.patch
deleted file mode 120000
index ce268dbe9b2..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-gnu/files/libgcc-ibm128-no-tag.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libgcc-ibm128-no-tag.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/use-pure-64bit-configs.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-gnu/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index b7e17774db1..05d17fcd8a1 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -91,9 +91,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/0010-ldbl128-config.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/0010-ldbl128-config.patch
deleted file mode 120000
index 02d68e45a47..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/0010-ldbl128-config.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/0010-ldbl128-config.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/libgcc-ibm128-no-tag.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/libgcc-ibm128-no-tag.patch
deleted file mode 120000
index ce268dbe9b2..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/libgcc-ibm128-no-tag.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libgcc-ibm128-no-tag.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/musl-ada.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/use-pure-64bit-configs.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index d2199de88a4..dd7ff2f0bd2 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -90,15 +90,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
-	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-powerpcle-linux-gnu/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-powerpcle-linux-gnu/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/files/libgcc-ibm128-no-tag.patch b/srcpkgs/cross-powerpcle-linux-gnu/files/libgcc-ibm128-no-tag.patch
deleted file mode 120000
index ce268dbe9b2..00000000000
--- a/srcpkgs/cross-powerpcle-linux-gnu/files/libgcc-ibm128-no-tag.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libgcc-ibm128-no-tag.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 82bbe178a44..1c4d4b3dbdc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -100,8 +100,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpcle-linux-musl/files/0010-ldbl128-config.patch b/srcpkgs/cross-powerpcle-linux-musl/files/0010-ldbl128-config.patch
deleted file mode 120000
index 02d68e45a47..00000000000
--- a/srcpkgs/cross-powerpcle-linux-musl/files/0010-ldbl128-config.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/0010-ldbl128-config.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-powerpcle-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-powerpcle-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpcle-linux-musl/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-powerpcle-linux-musl/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-powerpcle-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-powerpcle-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-musl/files/libgcc-ibm128-no-tag.patch b/srcpkgs/cross-powerpcle-linux-musl/files/libgcc-ibm128-no-tag.patch
deleted file mode 120000
index ce268dbe9b2..00000000000
--- a/srcpkgs/cross-powerpcle-linux-musl/files/libgcc-ibm128-no-tag.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/libgcc-ibm128-no-tag.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-powerpcle-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-powerpcle-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-powerpcle-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-powerpcle-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-musl/files/musl-ada.patch b/srcpkgs/cross-powerpcle-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-powerpcle-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 1f18e04faf9..e21df2d3e56 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -86,13 +86,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
-	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-x86_64-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-x86_64-linux-gnu/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-x86_64-linux-gnu/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-gnu/files/use-pure-64bit-configs.patch b/srcpkgs/cross-x86_64-linux-gnu/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-x86_64-linux-gnu/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index 7d49328e8ee..517aac977ac 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -91,8 +91,9 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-x86_64-linux-musl/files/fix-cxxflags-passing.patch
deleted file mode 120000
index 4a8c831e615..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/fix-cxxflags-passing.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch
deleted file mode 120000
index a093af85773..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-x86_64-linux-musl/files/invalid_tls_model.patch
deleted file mode 120000
index 8f276dc0538..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/invalid_tls_model.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/invalid_tls_model.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/libgnarl-musl.patch b/srcpkgs/cross-x86_64-linux-musl/files/libgnarl-musl.patch
deleted file mode 120000
index 33ccc9789f9..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/libgnarl-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-x86_64-linux-musl/files/libssp-musl.patch
deleted file mode 120000
index 37a7489360f..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/libssp-musl.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/musl-ada.patch b/srcpkgs/cross-x86_64-linux-musl/files/musl-ada.patch
deleted file mode 120000
index 64906d48ecb..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/musl-ada.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/musl-ada.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/use-pure-64bit-configs.patch b/srcpkgs/cross-x86_64-linux-musl/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 96e6c7feb71..d97a148b0e3 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -92,13 +92,12 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
-	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
-	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
-	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
+	for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
+		_apply_patch -p0 "$f"
+	done
+	for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
+		_apply_patch -p1 "$f"
+	done
 
 	msg_normal "Building cross gcc bootstrap\n"