Add aditional patches for linux-5.10.y and linux-6.1.y

linux-ia64 · Jan 19, 2024 · 9b293bd · 9b293bd
1 parent 01e9b1a
commit 9b293bd
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 0 deletions.
diff --git a/patches/linux-5.10.y/ia64-linux-workaround-ice-with-gcc-13.patch b/patches/linux-5.10.y/ia64-linux-workaround-ice-with-gcc-13.patch
@@ -0,0 +1,46 @@
+From: Frank Scheiner <[email protected]>
+Date: Mon, 18 Sep 2023 16:33:50 +0200
+Subject: [ia64] `-fno-var-tracking` works around an ICE in gcc-13 for target
+ ia64
+
+Apply it for the two files that trigger the ICE according to e.g. [1] to
+enable successful Linux kernel builds for ia64 when using gcc-13 until
+the corresponding GCC bug ([2]) is fixed.
+
+[1]: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=ia64&ver=6.4.4-2&stamp=1690708282&raw=0
+
+[2]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111425
+---
+ drivers/net/ethernet/broadcom/bnx2x/Makefile | 3 +++
+ net/ipv4/Makefile                            | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/drivers/net/ethernet/broadcom/bnx2x/Makefile b/drivers/net/ethernet/broadcom/bnx2x/Makefile
+index 2523cfc7527d..13db3ee9fcb5 100644
+--- a/drivers/net/ethernet/broadcom/bnx2x/Makefile
++++ b/drivers/net/ethernet/broadcom/bnx2x/Makefile
+@@ -5,5 +5,8 @@
+
+ obj-$(CONFIG_BNX2X) += bnx2x.o
+
++ifeq ($(ARCH),ia64)
++        CFLAGS_bnx2x_sp.o += -fno-var-tracking
++endif
+ bnx2x-y := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o bnx2x_ethtool.o bnx2x_stats.o bnx2x_dcb.o bnx2x_sp.o bnx2x_self_test.o
+ bnx2x-$(CONFIG_BNX2X_SRIOV) += bnx2x_vfpf.o bnx2x_sriov.o
+diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
+index b18ba8ef93ad..82326539bf25 100644
+--- a/net/ipv4/Makefile
++++ b/net/ipv4/Makefile
+@@ -3,6 +3,9 @@
+ # Makefile for the Linux TCP/IP (INET) layer.
+ #
+
++ifeq ($(ARCH),ia64)
++        CFLAGS_fib_semantics.o += -fno-var-tracking
++endif
+ obj-y     := route.o inetpeer.o protocol.o \
+ 	     ip_input.o ip_fragment.o ip_forward.o ip_options.o \
+ 	     ip_output.o ip_sockglue.o inet_hashtables.o \
+-- 
+2.11.0
diff --git a/patches/linux-6.1.y/ia64-linux-workaround-ice-with-gcc-13.patch b/patches/linux-6.1.y/ia64-linux-workaround-ice-with-gcc-13.patch
@@ -0,0 +1,46 @@
+From: Frank Scheiner <[email protected]>
+Date: Mon, 18 Sep 2023 16:33:50 +0200
+Subject: [ia64] `-fno-var-tracking` works around an ICE in gcc-13 for target
+ ia64
+
+Apply it for the two files that trigger the ICE according to e.g. [1] to
+enable successful Linux kernel builds for ia64 when using gcc-13 until
+the corresponding GCC bug ([2]) is fixed.
+
+[1]: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=ia64&ver=6.4.4-2&stamp=1690708282&raw=0
+
+[2]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111425
+---
+ drivers/net/ethernet/broadcom/bnx2x/Makefile | 3 +++
+ net/ipv4/Makefile                            | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/drivers/net/ethernet/broadcom/bnx2x/Makefile b/drivers/net/ethernet/broadcom/bnx2x/Makefile
+index 2523cfc7527d..13db3ee9fcb5 100644
+--- a/drivers/net/ethernet/broadcom/bnx2x/Makefile
++++ b/drivers/net/ethernet/broadcom/bnx2x/Makefile
+@@ -5,5 +5,8 @@
+
+ obj-$(CONFIG_BNX2X) += bnx2x.o
+
++ifeq ($(ARCH),ia64)
++        CFLAGS_bnx2x_sp.o += -fno-var-tracking
++endif
+ bnx2x-y := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o bnx2x_ethtool.o bnx2x_stats.o bnx2x_dcb.o bnx2x_sp.o bnx2x_self_test.o
+ bnx2x-$(CONFIG_BNX2X_SRIOV) += bnx2x_vfpf.o bnx2x_sriov.o
+diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
+index b18ba8ef93ad..82326539bf25 100644
+--- a/net/ipv4/Makefile
++++ b/net/ipv4/Makefile
+@@ -3,6 +3,9 @@
+ # Makefile for the Linux TCP/IP (INET) layer.
+ #
+
++ifeq ($(ARCH),ia64)
++        CFLAGS_fib_semantics.o += -fno-var-tracking
++endif
+ obj-y     := route.o inetpeer.o protocol.o \
+ 	     ip_input.o ip_fragment.o ip_forward.o ip_options.o \
+ 	     ip_output.o ip_sockglue.o inet_hashtables.o \
+-- 
+2.11.0