diff options
| -rw-r--r-- | package/eglibc/Makefile | 9 | ||||
| -rw-r--r-- | package/eglibc/files/libc.so.mips | 2 | ||||
| -rw-r--r-- | package/gcc/Makefile | 8 |
3 files changed, 15 insertions, 4 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 ) ) diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 6158d094f..8a6e267c8 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -20,8 +20,11 @@ TARGET_CPPFLAGS:= '' TARGET_CFLAGS:= '' TARGET_CXXFLAGS:= $(filter-out -fstack-protector,$(TARGET_CXXFLAGS)) -ifeq ($(ADK_LINUX_64),y) -CONFIGURE_ARGS+= --with-abi=64 +#ifeq ($(ADK_LINUX_64),y) +#CONFIGURE_ARGS+= --with-abi=64 +#endif +ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) +CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_ABI) endif CONFIGURE_ARGS+= --enable-languages=c,c++ \ @@ -51,7 +54,6 @@ post-install: cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++ cd ${IDIR_GCC}/usr/bin/ && ln -sf gcc cc ${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/ - ${CP} ${WRKINST}/usr/lib/libstdc++*so* ${IDIR_GCC}/usr/lib/ ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/ cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp . ${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/ |