diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /package/eglibc/files/libc.so.x86 | |
parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) |
resolve merge conflict
Diffstat (limited to 'package/eglibc/files/libc.so.x86')
-rw-r--r-- | package/eglibc/files/libc.so.x86 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/package/eglibc/files/libc.so.x86 b/package/eglibc/files/libc.so.x86 deleted file mode 100644 index cd8724cc5..000000000 --- a/package/eglibc/files/libc.so.x86 +++ /dev/null @@ -1,5 +0,0 @@ -/* GNU ld script - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ -OUTPUT_FORMAT(elf32-i386) -GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) |