Skip to contentSkip to conversation

package/linux-headers: fix uclibc-ng build for xtensa

PATCH New Max Filippov 2 participants 2 messages Sep 30, 2019 – Oct 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/linux-headers: fix uclibc-ng build for xtensa

Definition of struct clone_args made header include/uapi/linux/sched.h unusable for inclusion from assembly, breaking xtensa and riscv64 uclibc-ng builds. Backport proposed fix.

Fixes:
http://autobuild.buildroot.net/results/336ba3d9f44fdded48bc71a51e8620418793770b

---
 ..._ASSEMBLY__-guards-around-struct-clone_ar.patch | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/linux-headers/5.3.1/0001-sched-Add-__ASSEMBLY__-guards-around-struct-clone_ar.patch
package/linux-headers/5.3.1/0001-sched-Add-__ASSEMBLY__-guards-around-struct-clone_ar.patch new file +40 -0
new file mode 100644
index 000000000000..529718b75241
@@ -0,0 +1,40 @@
+From fd7af1d35a8154c54203264cd323113cae672e80 Mon Sep 17 00:00:00 2001
+From: Seth Forshee <[email protected]>
+Date: Tue, 17 Sep 2019 09:18:53 +0200
+Subject: [PATCH] sched: Add __ASSEMBLY__ guards around struct clone_args
+
+The addition of struct clone_args to uapi/linux/sched.h is not
+protected by __ASSEMBLY__ guards, causing a FTBFS for glibc on
+RISC-V. Add the guards to fix this.
+
+Fixes: 7f192e3cd316 ("fork: add clone3")
+Signed-off-by: Seth Forshee <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Max Filippov <[email protected]>
+---
+ include/uapi/linux/sched.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h
+index b3105ac1381a..851ff1feadd5 100644
+--- a/include/uapi/linux/sched.h
++++ b/include/uapi/linux/sched.h
+@@ -33,6 +33,7 @@
+ #define CLONE_NEWNET		0x40000000	/* New network namespace */
+ #define CLONE_IO		0x80000000	/* Clone io context */
+ 
++#ifndef __ASSEMBLY__
+ /*
+  * Arguments for the clone3 syscall
+  */
+@@ -46,6 +47,7 @@ struct clone_args {
+ 	__aligned_u64 stack_size;
+ 	__aligned_u64 tls;
+ };
++#endif
+ 
+ /*
+  * Scheduling policies
+-- 
+2.11.0
+
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/linux-headers: fix uclibc-ng build for xtensa

Quoted 3 lines · Max Filippov

Definition of struct clone_args made header include/uapi/linux/sched.h unusable for inclusion from assembly, breaking xtensa and riscv64 uclibc-ng builds. Backport proposed fix.

This proposed fix has been included in 5.3.6 which is now our default version.
So I assume this patch is no longer needed. I've marked it as Superseded (by the kernel version bump).

Regards,
Arnout

Quoted 4 lines

Fixes:
http://autobuild.buildroot.net/results/336ba3d9f44fdded48bc71a51e8620418793770b

[snip]