diff options
| author |   Holger Hoffstätte <holger@applied-asynchrony.com> | 2024-07-23 00:48:18 +0200 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2024-07-23 16:13:40 +0200 |
| commit | 461b33118c1d8b038088b5d8552f2fa8658bc5af (patch) | |
| tree | 42386c1471eab48d3abe36cea2407b44ef098849 /app-arch | |
| parent | net-wireless/blueman: Add libpulse test dep (diff) | |
| download | gentoo-461b33118c1d8b038088b5d8552f2fa8658bc5af.tar.gz gentoo-461b33118c1d8b038088b5d8552f2fa8658bc5af.tar.bz2 gentoo-461b33118c1d8b038088b5d8552f2fa8658bc5af.zip | |
app-arch/lz4: fix test failures
Add patches for proper stack alignment in the freestanding test
and to disable stack protector for the same test to allow building
with clang.
Bug: https://github.com/lz4/lz4/issues/1466
Closes: https://bugs.gentoo.org/936480
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/37681
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/lz4/files/1.10.0-fix-freestanding-test.patch | 42 | ||||
| -rw-r--r-- | app-arch/lz4/lz4-1.10.0-r1.ebuild | 4 |
2 files changed, 46 insertions, 0 deletions
diff --git a/app-arch/lz4/files/1.10.0-fix-freestanding-test.patch b/app-arch/lz4/files/1.10.0-fix-freestanding-test.patch new file mode 100644 index 000000000000..f8dfe2a41c64 --- /dev/null +++ b/app-arch/lz4/files/1.10.0-fix-freestanding-test.patch @@ -0,0 +1,42 @@ + +From: https://github.com/lz4/lz4/pull/1468 + +commit 63267a77d863f63826d8b13ddb8c190d3a4c01c5 +Author: Holger Hoffstätte <holger@applied-asynchrony.com> +Date: Mon Jul 22 22:11:19 2024 +0200 + + Fix stack alignment of _start() in freestanding test + + When the freestanding test is built with any kind of optimization + that enables vectorized loops, special care must be taken to align + the stack for _start() at a 16-byte boundary. + +diff --git a/tests/freestanding.c b/tests/freestanding.c +index 6109aa7..96de9d3 100644 +--- a/tests/freestanding.c ++++ b/tests/freestanding.c +@@ -225,7 +225,7 @@ EXTERN_C int memcmp(const void *s1, const void *s2, size_t n) { + + + // +-EXTERN_C void _start(void) { ++EXTERN_C void __attribute__((force_align_arg_pointer)) _start(void) { + test(); + MY_exit(0); + } + +Disable the stack protector to allow building with clang. +See https://bugs.gentoo.org/936480 + +diff -up lz4-1.10.0/build/meson/meson/tests/meson.build lz4-1.10.0/build/meson/meson/tests/meson.build +--- lz4-1.10.0/build/meson/meson/tests/meson.build 2024-07-21 19:29:49.000000000 +0200 ++++ lz4-1.10.0/build/meson/meson/tests/meson.build 2024-07-23 01:26:40.561113031 +0200 +@@ -47,7 +47,7 @@ test_exes = { + }, + 'freestanding': { + 'sources': files(lz4_source_root / 'tests/freestanding.c'), +- 'c_args': ['-ffreestanding', '-Wno-unused-parameter', '-Wno-declaration-after-statement'], ++ 'c_args': ['-ffreestanding', '-fno-stack-protector', '-Wno-unused-parameter', '-Wno-declaration-after-statement'], + 'link_args': ['-nostdlib'], + 'build': cc.get_id() in ['gcc', 'clang'] and + host_machine.system() == 'linux' and host_machine.cpu_family() == 'x86_64', diff --git a/app-arch/lz4/lz4-1.10.0-r1.ebuild b/app-arch/lz4/lz4-1.10.0-r1.ebuild index d05fa3dd02fb..7cbc02aadc78 100644 --- a/app-arch/lz4/lz4-1.10.0-r1.ebuild +++ b/app-arch/lz4/lz4-1.10.0-r1.ebuild @@ -17,6 +17,10 @@ RESTRICT="!test? ( test )" EMESON_SOURCE=${S}/build/meson +PATCHES=( + "${FILESDIR}/${PV}-fix-freestanding-test.patch" +) + multilib_src_configure() { local emesonargs=( -Dtests=$(usex test true false) |