Skip to content
Snippets Groups Projects
Verified Commit 7fb83a9f authored by Anna Wilcox's avatar Anna Wilcox :fox:
Browse files

user/llvm18: Ensure stack sizes are set properly

* Run `chelf` on the binaries after they are installed, in case they are
  re-linked during the install process.  This was the cause of #1272.

* Disable two more tests that caused failures on gwyn due to #1250.

Closes: #1272
parent bc7fcd1b
No related branches found
No related tags found
1 merge request!800user/llvm18: Ensure stack sizes are set properly
...@@ -130,7 +130,9 @@ prepare() { ...@@ -130,7 +130,9 @@ prepare() {
#1250 #1250
rm -v \ rm -v \
test/tools/dsymutil/ARM/DWARFLinkerParallel/accel-imported-declarations.test \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-member-functions.cpp \ test/tools/dsymutil/X86/DWARFLinkerParallel/odr-member-functions.cpp \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-parents.test \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-predictable-output2.test \ test/tools/dsymutil/X86/DWARFLinkerParallel/odr-predictable-output2.test \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-string.test \ test/tools/dsymutil/X86/DWARFLinkerParallel/odr-string.test \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-uniquing.cpp test/tools/dsymutil/X86/DWARFLinkerParallel/odr-uniquing.cpp
...@@ -246,6 +248,13 @@ package() { ...@@ -246,6 +248,13 @@ package() {
ln -s ../../include/$pkgname include ln -s ../../include/$pkgname include
ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm
# Thread 3 requires a lot of stack space to LTO when targeting ARM.
# Note that this occurs even when crossing (on a ppc64 host).
chelf -s 1048576 bin/llvm-lto2
# Needed for parallel-linker support (pthread stack size).
chelf -s 1048576 bin/dsymutil
chelf -s 1048576 bin/llvm-dwarfutil
} }
static() { static() {
......
...@@ -130,7 +130,9 @@ prepare() { ...@@ -130,7 +130,9 @@ prepare() {
#1250 #1250
rm -v \ rm -v \
test/tools/dsymutil/ARM/DWARFLinkerParallel/accel-imported-declarations.test \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-member-functions.cpp \ test/tools/dsymutil/X86/DWARFLinkerParallel/odr-member-functions.cpp \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-parents.test \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-predictable-output2.test \ test/tools/dsymutil/X86/DWARFLinkerParallel/odr-predictable-output2.test \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-string.test \ test/tools/dsymutil/X86/DWARFLinkerParallel/odr-string.test \
test/tools/dsymutil/X86/DWARFLinkerParallel/odr-uniquing.cpp test/tools/dsymutil/X86/DWARFLinkerParallel/odr-uniquing.cpp
...@@ -246,6 +248,13 @@ package() { ...@@ -246,6 +248,13 @@ package() {
ln -s ../../include/$pkgname include ln -s ../../include/$pkgname include
ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm
# Thread 3 requires a lot of stack space to LTO when targeting ARM.
# Note that this occurs even when crossing (on a ppc64 host).
chelf -s 1048576 bin/llvm-lto2
# Needed for parallel-linker support (pthread stack size).
chelf -s 1048576 bin/dsymutil
chelf -s 1048576 bin/llvm-dwarfutil
} }
static() { static() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment