From ae5bb65cc6d8daf1f142c0a38f31b9db8eed4157 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Fri, 17 Apr 2020 13:04:37 +0300 Subject: [PATCH 1/3] elfutils: aarch64 fix build on musl aarch64_initreg.c: In function 'aarch64_set_initial_registers_tid': aarch64_initreg.c:85:37: error: invalid operands to binary & (have 'long double' and 'unsigned int') dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF; ~~~~~~~~~~~~~~ ^ Signed-off-by: Lucian Cristian --- .../006-Fix-build-on-aarch64-musl.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch diff --git a/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch b/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch new file mode 100644 index 0000000000..6f7956c5ae --- /dev/null +++ b/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch @@ -0,0 +1,59 @@ +From 578f370c7e7a9f056aefa062b34590b0aa13bce5 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 15 Aug 2017 17:27:30 +0800 +Subject: [PATCH] Fix build on aarch64/musl + +Errors + +invalid operands to binary & (have 'long double' and 'unsigned int') + +error: redefinition + of 'struct iovec' + struct iovec { void *iov_base; size_t iov_len; }; + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Rebase to 0.170 +Signed-off-by: Hongxu Jia + +--- + backends/aarch64_initreg.c | 4 ++-- + backends/arm_initreg.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c +index daf6f37..6445276 100644 +--- a/backends/aarch64_initreg.c ++++ b/backends/aarch64_initreg.c +@@ -33,7 +33,7 @@ + #include "system.h" + #include + #if defined(__aarch64__) && defined(__linux__) +-# include ++# include + # include + # include + /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ +@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), + + Dwarf_Word dwarf_fregs[32]; + for (int r = 0; r < 32; r++) +- dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF; ++ dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0xFFFFFFFF; + + if (! setfunc (64, 32, dwarf_fregs, arg)) + return false; +diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c +index efcabaf..062bb9e 100644 +--- a/backends/arm_initreg.c ++++ b/backends/arm_initreg.c +@@ -38,7 +38,7 @@ + #endif + + #ifdef __aarch64__ +-# include ++# include + # include + # include + /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ From ab6613228802f21b129f21b67b486807fb201753 Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 17 Apr 2020 21:14:01 +0800 Subject: [PATCH 2/3] rtl8821cu: enable job server in packages --- package/ctcgfw/rtl8821cu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ctcgfw/rtl8821cu/Makefile b/package/ctcgfw/rtl8821cu/Makefile index 3ba640a036..5c70507cce 100644 --- a/package/ctcgfw/rtl8821cu/Makefile +++ b/package/ctcgfw/rtl8821cu/Makefile @@ -59,7 +59,7 @@ MAKE_OPTS:= \ $(EXTRA_KCONFIG) define Build/Compile - $(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ + +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ $(MAKE_OPTS) \ modules endef From 4f82564b3b071d057e2df89b0c5dc1a9303e8660 Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 17 Apr 2020 21:14:38 +0800 Subject: [PATCH 3/3] rtl8821cu: fixing in kernel>=5.2 https://github.com/project-openwrt/openwrt-kisco/issues/12 --- .../patches/020-compatible-with-kernel-5.4.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/ctcgfw/rtl8821cu/patches/020-compatible-with-kernel-5.4.patch diff --git a/package/ctcgfw/rtl8821cu/patches/020-compatible-with-kernel-5.4.patch b/package/ctcgfw/rtl8821cu/patches/020-compatible-with-kernel-5.4.patch new file mode 100644 index 0000000000..a6f5344843 --- /dev/null +++ b/package/ctcgfw/rtl8821cu/patches/020-compatible-with-kernel-5.4.patch @@ -0,0 +1,13 @@ +diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c +index 345af67..54a07db 100644 +--- a/os_dep/linux/os_intfs.c ++++ b/os_dep/linux/os_intfs.c +@@ -1562,7 +1562,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb + #else + , void *accel_priv + #endif +- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + , select_queue_fallback_t fallback + #endif + #endif