diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-20 21:48:42 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-20 21:49:29 -0700 |
commit | 2f26e8af669a8f27723f8b0f4820bd2b4ebd266a (patch) | |
tree | 157cd2a7fd2ad238e141a0d0d879434251c31ec4 /meta-oe/recipes-test | |
parent | 1e6a27d8e226029689caa22a7cec10f8982ad180 (diff) | |
download | meta-openembedded-2f26e8af669a8f27723f8b0f4820bd2b4ebd266a.tar.gz |
stress-ng: Fix build on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-test')
-rw-r--r-- | meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch new file mode 100644 index 000000000..cd9131df5 --- /dev/null +++ b/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 59f5ff72768f228cd530bb18a5fc3e8c4772857a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 Aug 2018 21:43:14 -0700 | ||
4 | Subject: [PATCH] stress-ng: don't enable TARGET_CLONES for musl | ||
5 | |||
6 | musl does not support gnu ifuncs | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/27] | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | stress-ng.h | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/stress-ng.h b/stress-ng.h | ||
16 | index b9359a4..f228808 100644 | ||
17 | --- a/stress-ng.h | ||
18 | +++ b/stress-ng.h | ||
19 | @@ -1090,7 +1090,7 @@ extern void pr_fail_dbg__(const args_t *args, const char *msg); | ||
20 | #endif | ||
21 | |||
22 | /* GCC5.0+ target_clones attribute */ | ||
23 | -#if defined(__GNUC__) && NEED_GNUC(5,5,0) && STRESS_X86 && \ | ||
24 | +#if defined(__GNUC__) && defined(__GLIBC__) && NEED_GNUC(5,5,0) && STRESS_X86 && \ | ||
25 | !defined(__gnu_hurd__) && !defined(__FreeBSD_Kernel__) | ||
26 | #define TARGET_CLONES __attribute__((target_clones("sse","sse2","ssse3", "sse4.1", "sse4a", "avx","avx2","default"))) | ||
27 | #else | ||
28 | -- | ||
29 | 2.18.0 | ||
30 | |||
diff --git a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb index 19ce64192..a6c327e38 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb +++ b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb | |||
@@ -7,6 +7,7 @@ DEPENDS = "zlib libaio" | |||
7 | 7 | ||
8 | SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ | 8 | SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ |
9 | file://0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch \ | 9 | file://0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch \ |
10 | file://0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI_append_libc-musl = " \ | 12 | SRC_URI_append_libc-musl = " \ |
12 | file://0001-Several-changes-to-fix-musl-build.patch \ | 13 | file://0001-Several-changes-to-fix-musl-build.patch \ |