From 200f627a9cc414faa2e4769c0bafad9b92029e28 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 27 Jul 2022 15:06:56 +0200 Subject: [PATCH] ipq807x: Fix installation of FTBFS gcc 5.5 patch The toolchain path will not automatically be copied to OpenWrt. So the build will still fail on recent Debian unstable version. Instead, it must be applied during the setup.py process via the normal patch procedure. Reported-by: Marek Lindner Fixes: 6f6b40a94ff6 ("toolchain/gcc: fix building gcc 5.5 on newer systems") Signed-off-by: Sven Eckelmann --- ...ix-building-gcc-5.5-on-newer-systems.patch | 23 +++++++++++++++++++ .../gcc/patches/5.5.0/003-build_fix.patch | 11 --------- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 patches/ipq807x/0006-toolchain-gcc-fix-building-gcc-5.5-on-newer-systems.patch delete mode 100644 toolchain/gcc/patches/5.5.0/003-build_fix.patch diff --git a/patches/ipq807x/0006-toolchain-gcc-fix-building-gcc-5.5-on-newer-systems.patch b/patches/ipq807x/0006-toolchain-gcc-fix-building-gcc-5.5-on-newer-systems.patch new file mode 100644 index 000000000..ecf2901dc --- /dev/null +++ b/patches/ipq807x/0006-toolchain-gcc-fix-building-gcc-5.5-on-newer-systems.patch @@ -0,0 +1,23 @@ +From: Felix Fietkau +Date: Tue, 1 Mar 2022 17:03:50 +0100 +Subject: toolchain/gcc: fix building gcc 5.5 on newer systems + +Signed-off-by: Felix Fietkau + +diff --git a/toolchain/gcc/patches/5.5.0/003-build_fix.patch b/toolchain/gcc/patches/5.5.0/003-build_fix.patch +new file mode 100644 +index 0000000000000000000000000000000000000000..9602cd3b1cbc6ae787690a44564132d1af05746a +--- /dev/null ++++ b/toolchain/gcc/patches/5.5.0/003-build_fix.patch +@@ -0,0 +1,11 @@ ++--- a/gcc/reload.h +++++ b/gcc/reload.h ++@@ -168,7 +168,7 @@ struct target_reload { ++ value indicates the level of indirect addressing supported, e.g., two ++ means that (MEM (MEM (REG n))) is also valid if (REG n) does not get ++ a hard register. */ ++- bool x_spill_indirect_levels; +++ unsigned char x_spill_indirect_levels; ++ ++ /* True if caller-save has been reinitialized. */ ++ bool x_caller_save_initialized_p; diff --git a/toolchain/gcc/patches/5.5.0/003-build_fix.patch b/toolchain/gcc/patches/5.5.0/003-build_fix.patch deleted file mode 100644 index 9602cd3b1..000000000 --- a/toolchain/gcc/patches/5.5.0/003-build_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gcc/reload.h -+++ b/gcc/reload.h -@@ -168,7 +168,7 @@ struct target_reload { - value indicates the level of indirect addressing supported, e.g., two - means that (MEM (MEM (REG n))) is also valid if (REG n) does not get - a hard register. */ -- bool x_spill_indirect_levels; -+ unsigned char x_spill_indirect_levels; - - /* True if caller-save has been reinitialized. */ - bool x_caller_save_initialized_p;