diff options
| author | Cem Keylan <cem@ckyln.com> | 2020-05-19 03:20:45 +0300 |
|---|---|---|
| committer | Cem Keylan <cem@ckyln.com> | 2020-05-19 03:20:45 +0300 |
| commit | ac8e98a0299c571a78022195b8fd4f6cb75e64a1 (patch) | |
| tree | 99a5dda666b2c68a64dbbd75f41844a25bbed0e9 | |
| parent | e1af9f2c808433ec51fe1627fc186f0a10db5a43 (diff) | |
| download | repository-ac8e98a0299c571a78022195b8fd4f6cb75e64a1.tar.gz | |
musl: i686 fixes
| -rwxr-xr-x | i686/musl/build | 9 | ||||
| -rw-r--r-- | i686/musl/checksums | 1 | ||||
| -rw-r--r-- | i686/musl/files/__stack_chk_fail_local.c | 2 | ||||
| -rw-r--r-- | i686/musl/sources | 1 |
4 files changed, 11 insertions, 2 deletions
diff --git a/i686/musl/build b/i686/musl/build index aa99e23b..0549bc5f 100755 --- a/i686/musl/build +++ b/i686/musl/build @@ -8,7 +8,8 @@ make make DESTDIR="$1" install mkdir -p "$1/usr/bin" -ln -s /usr/lib/ld-musl-i686.so.1 "$1/usr/bin/ldd" +ln -s libc.so "$1/usr/lib/libc.musl-x86.so" +ln -s /usr/lib/ld-musl-i386.so.1 "$1/usr/bin/ldd" # Install BSD compatibility headers. install -Dm 755 cdefs.h "$1/usr/include/sys/cdefs.h" @@ -16,4 +17,8 @@ install -Dm 755 queue.h "$1/usr/include/sys/queue.h" install -Dm 755 tree.h "$1/usr/include/sys/tree.h" # Install getconf. -cc getconf.c -o "$1/usr/bin/getconf" +"${CC:-cc}" getconf.c -o "$1/usr/bin/getconf" + +# Install libssp_nonshared.a +"${CC:-cc}" -c __stack_chk_fail_local.c -o __stack_chk_fail_local.o +ar r "$1/usr/lib/libssp_nonshared.a" __stack_chk_fail_local.o diff --git a/i686/musl/checksums b/i686/musl/checksums index 2c1529df..ce8e8382 100644 --- a/i686/musl/checksums +++ b/i686/musl/checksums @@ -3,3 +3,4 @@ c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8 musl-1.2.0.tar c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h e1e498a79bf160a5766fa560f2b07b206fe89fe21a62600c77d72e00a6992f92 tree.h d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c +299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c diff --git a/i686/musl/files/__stack_chk_fail_local.c b/i686/musl/files/__stack_chk_fail_local.c new file mode 100644 index 00000000..2b403a6e --- /dev/null +++ b/i686/musl/files/__stack_chk_fail_local.c @@ -0,0 +1,2 @@ +extern void __stack_chk_fail(void); +void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); } diff --git a/i686/musl/sources b/i686/musl/sources index 502f8461..e6cc4817 100644 --- a/i686/musl/sources +++ b/i686/musl/sources @@ -3,3 +3,4 @@ files/cdefs.h files/queue.h files/tree.h files/getconf.c +files/__stack_chk_fail_local.c |