From 09e1c01162c2faa204f3b7f9abf6f7b1c4e9274c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 6 Mar 2020 23:29:04 -0800 Subject: make: Fix build on arm/clang clang defines __arm which is interpreted as non-posix by make build system but thats not correct when using clang so patch addresses that (From OE-Core rev: e225278a8a894389add56d14908398c14512f6c9) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-makeinst-Do-not-undef-POSIX-on-clang-arm.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch (limited to 'meta/recipes-devtools/make/make') diff --git a/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch new file mode 100644 index 0000000000..2da7c983dc --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch @@ -0,0 +1,38 @@ +From 86b7947156a0c33e768d0a265e38f2881a70a7e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 6 Mar 2020 23:19:37 -0800 +Subject: [PATCH] makeinst: Do not undef POSIX on clang/arm + +if __arm internal compiler macro is defined then make assumes that the +system is not posix and goes ahead and undefs POSIX, which results in +miscompiling make with clang, since clang does define __arm unlike gcc +which does not, but they both support posix just fine, so here check for +compiler not being clang when __arm is defined before undefining posix + +Fixes error like +../make-4.3/src/job.c:507:27: error: too many arguments to function call, expected 0, have 1 + sigsetmask (siggetmask (0) & ~fatal_signal_mask) + ~~~~~~~~~~ ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/makeint.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/makeint.h b/src/makeint.h +index c428a36..fadf963 100644 +--- a/src/makeint.h ++++ b/src/makeint.h +@@ -115,7 +115,7 @@ extern int errno; + #endif + + /* Some systems define _POSIX_VERSION but are not really POSIX.1. */ +-#if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) ++#if (defined (butterfly) || (defined (__arm) && !defined(__clang__)) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) + # undef POSIX + #endif + +-- +2.25.1 + -- cgit v1.2.3-54-g00ecf