diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 17:48:11 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 17:48:11 +0200 |
| commit | faa42a4f22ce1fa49db60a12881124f1dfaebdde (patch) | |
| tree | 59991b07359054bed769ad578723a829a09103d5 /package/eglibc | |
| parent | db29cc08fc257dcdddc71647838d2483643ddeb7 (diff) | |
| parent | f28fcf0e878ed04a29d76080954f94709b77a980 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/eglibc')
| -rw-r--r-- | package/eglibc/Makefile | 9 | ||||
| -rw-r--r-- | package/eglibc/files/libc.so.mips | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 5bf290fe9..5466ddb85 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -91,6 +91,15 @@ eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib # install linker script -cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so +ifeq ($(ADK_TARGET_ABI_O32),y) + $(SED) "s#@@ELFFORMAT@@#elf32-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so +endif +ifeq ($(ADK_TARGET_ABI_N32),y) + $(SED) "s#@@ELFFORMAT@@#elf32-ntradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so +endif +ifeq ($(ADK_TARGET_ABI_N64),y) + $(SED) "s#@@ELFFORMAT@@#elf64-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so +endif ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib -for file in libc libcrypt libdl libm libresolv librt libutil; do \ diff --git a/package/eglibc/files/libc.so.mips b/package/eglibc/files/libc.so.mips index 6165d3e9c..9e73ea39c 100644 --- a/package/eglibc/files/libc.so.mips +++ b/package/eglibc/files/libc.so.mips @@ -1,5 +1,5 @@ /* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf64-tradlittlemips) + OUTPUT_FORMAT(@@ELFTARGET@@) GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) ) |