-
-
Notifications
You must be signed in to change notification settings - Fork 470
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
When we relax R_X86_64_TLSGD or R_X86_64_TLSGD, we rewrite two instructions (the one referred by TLSGD/TLSLD and the following one referred by the following relocation). The second instruction is usually 5 bytes, but if it can be longer than that, and if that's the case, we need to emit a nop to fill the gap at the end of the longer instruction. We didn't do that. As a result, the remaining garbage of the second instruction is executed and caused an unpredictable result (illegal instruction or segv). This patch fixes the issue. Fixes #360
- Loading branch information
Showing
3 changed files
with
181 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| #!/bin/bash | ||
| export LANG= | ||
| set -e | ||
| CC="${CC:-cc}" | ||
| CXX="${CXX:-c++}" | ||
| testname=$(basename "$0" .sh) | ||
| echo -n "Testing $testname ... " | ||
| cd "$(dirname "$0")"/../.. | ||
| mold="$(pwd)/mold" | ||
| t=out/test/elf/$testname | ||
| mkdir -p $t | ||
|
|
||
| if [ "$(uname -m)" = x86_64 ]; then | ||
| dialect=gnu | ||
| elif [ "$(uname -m)" = aarch64 ]; then | ||
| dialect=trad | ||
| else | ||
| echo skipped | ||
| exit 0 | ||
| fi | ||
|
|
||
| cat <<EOF | gcc -mtls-dialect=$dialect -fPIC -c -o $t/a.o -xc - -mcmodel=large | ||
| #include <stdio.h> | ||
| static _Thread_local int x1 = 1; | ||
| static _Thread_local int x2; | ||
| extern _Thread_local int x3; | ||
| extern _Thread_local int x4; | ||
| int get_x5(); | ||
| int get_x6(); | ||
| int main() { | ||
| x2 = 2; | ||
| printf("%d %d %d %d %d %d\n", x1, x2, x3, x4, get_x5(), get_x6()); | ||
| return 0; | ||
| } | ||
| EOF | ||
|
|
||
| cat <<EOF | gcc -mtls-dialect=$dialect -fPIC -c -o $t/b.o -xc - -mcmodel=large | ||
| _Thread_local int x3 = 3; | ||
| static _Thread_local int x5 = 5; | ||
| int get_x5() { return x5; } | ||
| EOF | ||
|
|
||
|
|
||
| cat <<EOF | gcc -mtls-dialect=$dialect -fPIC -c -o $t/c.o -xc - -mcmodel=large | ||
| _Thread_local int x4 = 4; | ||
| static _Thread_local int x6 = 6; | ||
| int get_x6() { return x6; } | ||
| EOF | ||
|
|
||
| $CC -B. -shared -o $t/d.so $t/b.o -mcmodel=large | ||
| $CC -B. -shared -o $t/e.so $t/c.o -Wl,--no-relax -mcmodel=large | ||
|
|
||
| $CC -B. -o $t/exe $t/a.o $t/d.so $t/e.so -mcmodel=large | ||
| $t/exe | grep -q '1 2 3 4 5 6' | ||
|
|
||
| $CC -B. -o $t/exe $t/a.o $t/d.so $t/e.so -Wl,-no-relax -mcmodel=large | ||
| $t/exe | grep -q '1 2 3 4 5 6' | ||
|
|
||
| echo OK |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| #!/bin/bash | ||
| export LANG= | ||
| set -e | ||
| CC="${CC:-cc}" | ||
| CXX="${CXX:-c++}" | ||
| testname=$(basename "$0" .sh) | ||
| echo -n "Testing $testname ... " | ||
| cd "$(dirname "$0")"/../.. | ||
| mold="$(pwd)/mold" | ||
| t=out/test/elf/$testname | ||
| mkdir -p $t | ||
|
|
||
| if [ "$(uname -m)" = x86_64 ]; then | ||
| dialect=gnu | ||
| elif [ "$(uname -m)" = aarch64 ]; then | ||
| dialect=trad | ||
| else | ||
| echo skipped | ||
| exit 0 | ||
| fi | ||
|
|
||
| cat <<EOF | gcc -ftls-model=local-dynamic -mtls-dialect=$dialect -fPIC -c -o $t/a.o -xc - -mcmodel=large | ||
| #include <stdio.h> | ||
| extern _Thread_local int foo; | ||
| static _Thread_local int bar; | ||
| int *get_foo_addr() { return &foo; } | ||
| int *get_bar_addr() { return &bar; } | ||
| int main() { | ||
| bar = 5; | ||
| printf("%d %d %d %d\n", *get_foo_addr(), *get_bar_addr(), foo, bar); | ||
| return 0; | ||
| } | ||
| EOF | ||
|
|
||
| cat <<EOF | gcc -ftls-model=local-dynamic -mtls-dialect=$dialect -fPIC -c -o $t/b.o -xc - -mcmodel=large | ||
| _Thread_local int foo = 3; | ||
| EOF | ||
|
|
||
| $CC -B. -o $t/exe $t/a.o $t/b.o -mcmodel=large | ||
| $t/exe | grep -q '3 5 3 5' | ||
|
|
||
| $CC -B. -o $t/exe $t/a.o $t/b.o -Wl,-no-relax -mcmodel=large | ||
| $t/exe | grep -q '3 5 3 5' | ||
|
|
||
| echo OK |