mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-19 08:36:44 +00:00
Code Issues Projects Releases Wiki Activity

[lld][WebAssembly] Don't report relocation error when linking with -r/--relocatable (#109822)

Browse Source 
Followup to #104926.

We ran into issues on the emscripten waterfall where relocation against
`__dso_handle` were being reported as errors even though
`-r/--relocatable` was being used to generate object file output rather
than executable output.
This commit is contained in:
Sam Clegg 2024-09-24 11:14:07 -07:00 committed by GitHub
parent 6dfeea3f86
commit 312f73765b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/test/wasm/unsupported-pic-relocations.s
View File

@ -15,6 +15,10 @@
# RUN: not wasm-ld --experimental-pic -shared %t.o -o /dev/null --unresolved-symbols=import-dynamic 2>&1 | \
# RUN: FileCheck %s
## These errors should not be reported under -r/--relocation (i.e. when
## generating an object file)
# RUN: wasm-ld --experimental-pic -r %t.o -o /dev/null
.functype external_func () -> ()
use_undefined_function:
@ -23,7 +27,7 @@ use_undefined_function:
# CHECK: error: {{.*}}.o: relocation R_WASM_TABLE_INDEX_REL_SLEB is not supported against an undefined symbol `external_func`
drop
end_function
use_undefined_data:
.functype use_undefined_data () -> ()
i32.const external_data@MBREL

6
lld/test/wasm/unsupported-pic-relocations64.s
View File

@ -15,6 +15,10 @@
# RUN: not wasm-ld -mwasm64 --experimental-pic -shared %t.o -o /dev/null --unresolved-symbols=import-dynamic 2>&1 | \
# RUN: FileCheck %s
## These errors should not be reported under -r/--relocation (i.e. when
## generating an object file)
# RUN: wasm-ld -mwasm64 --experimental-pic -r %t.o -o /dev/null
.functype external_func () -> ()
use_undefined_function:
@ -23,7 +27,7 @@ use_undefined_function:
# CHECK: error: {{.*}}.o: relocation R_WASM_TABLE_INDEX_REL_SLEB64 is not supported against an undefined symbol `external_func`
drop
end_function
use_undefined_data:
.functype use_undefined_data () -> ()
i64.const external_data@MBREL

10
lld/wasm/Relocations.cpp
View File

@ -173,7 +173,7 @@ void scanRelocations(InputChunk *chunk) {
}
}
if (sym->isUndefined()) {
if (!config->relocatable && sym->isUndefined()) {
switch (reloc.Type) {
case R_WASM_TABLE_INDEX_REL_SLEB:
case R_WASM_TABLE_INDEX_REL_SLEB64:
@ -187,11 +187,11 @@ void scanRelocations(InputChunk *chunk) {
toString(*sym) + "`");
break;
}
}
if (sym->isUndefined() && !config->relocatable && !sym->isWeak()) {
// Report undefined symbols
reportUndefined(file, sym);
if (!sym->isWeak()) {
// Report undefined symbols
reportUndefined(file, sym);
}
}
}
}