[commit: ghc] master: Extend linker-script workaround to work with musl libc (64ce6af)
git at git.haskell.org
git at git.haskell.org
Tue Jan 22 06:33:24 UTC 2019
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/64ce6afa21fadd751e1700af145ab77059abadc6/ghc
>---------------------------------------------------------------
commit 64ce6afa21fadd751e1700af145ab77059abadc6
Author: Samuel Holland <samuel at sholland.org>
Date: Sun Jan 20 20:20:16 2019 -0600
Extend linker-script workaround to work with musl libc
GHC has code to handle unsuffixed .so files that are linker scripts
pointing to the real shared library. The detection is done by parsing
the result of `dlerror()` after calling `dlopen()` and looking for
certain error strings. On musl libc, the error message is "Exec format
error", which happens to be `strerror(ENOEXEC)`:
```
$ cat tmp.c
#include <dlfcn.h>
#include <stdio.h>
int main(void) {
dlopen("libz.so", RTLD_NOW | RTLD_GLOBAL);
puts(dlerror());
return 0;
}
$ gcc -o tmp tmp.c
$ ./tmp
Error loading shared library libz.so: Exec format error
$
```
This change fixes the workaround to also work on musl libc.
Link: https://phabricator.haskell.org/D5474
>---------------------------------------------------------------
64ce6afa21fadd751e1700af145ab77059abadc6
rts/Linker.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rts/Linker.c b/rts/Linker.c
index 5b10b79..ac030af 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -483,7 +483,7 @@ initLinker_ (int retain_cafs)
# endif /* RTLD_DEFAULT */
compileResult = regcomp(&re_invalid,
- "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)",
+ "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format|Exec format error)",
REG_EXTENDED);
if (compileResult != 0) {
barf("Compiling re_invalid failed");
More information about the ghc-commits
mailing list