logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 52de3828d78673a30c2a92c70c41e99558e19502
parent 711d9f752135ac5b7fa3575fdd6574af4b1d10d6
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 20 Feb 2020 17:17:42 -0800

linux-headers: Only use inline asm on GNU-compatible C compilers

Diffstat:

Mpkg/linux-headers/fetch.sh4++++
Apkg/linux-headers/patch/0001-Only-use-inline-asm-in-headers-on-GNU-compatible-com.patch32++++++++++++++++++++++++++++++++
Mpkg/linux-headers/ver2+-
3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/pkg/linux-headers/fetch.sh b/pkg/linux-headers/fetch.sh @@ -22,3 +22,7 @@ xzcat "$archive" | ${PAXREAD:-pax -r} -s ',^[^/]*,src,' \ 'linux-*/arch/*/syscalls' \ 'linux-*/include/uapi' \ 'linux-*/scripts/unifdef.c' + +if [ -d patch ] ; then + git apply -v --whitespace=nowarn --directory "$dir/src" patch/* +fi diff --git a/pkg/linux-headers/patch/0001-Only-use-inline-asm-in-headers-on-GNU-compatible-com.patch b/pkg/linux-headers/patch/0001-Only-use-inline-asm-in-headers-on-GNU-compatible-com.patch @@ -0,0 +1,32 @@ +From 0043f6d3073da1b4adc0cdfd9bf1768a58034353 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Mon, 17 Jun 2019 20:11:17 -0700 +Subject: [PATCH] Only use inline asm in headers on GNU-compatible compilers + +--- + arch/x86/include/uapi/asm/swab.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/x86/include/uapi/asm/swab.h b/arch/x86/include/uapi/asm/swab.h +index cd3fd8ddbe9a..2074e5d7d94d 100644 +--- a/arch/x86/include/uapi/asm/swab.h ++++ b/arch/x86/include/uapi/asm/swab.h +@@ -5,6 +5,8 @@ + #include <linux/types.h> + #include <linux/compiler.h> + ++#ifdef __GNUC__ ++ + static inline __attribute_const__ __u32 __arch_swab32(__u32 val) + { + asm("bswapl %0" : "=r" (val) : "0" (val)); +@@ -34,4 +36,6 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 val) + } + #define __arch_swab64 __arch_swab64 + ++#endif /* __GNUC__ */ ++ + #endif /* _ASM_X86_SWAB_H */ +-- +2.25.0 + diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver @@ -1 +1 @@ -5.5.3 r0 +5.5.3 r1