diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-20 09:59:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-20 09:59:43 +0100 |
| commit | 9db6f01aedebd0ace3926251ae2dbbc170cdacf7 (patch) | |
| tree | ec99f71047f2e45251b0cfbcc09611ff4a97e60f | |
| parent | 1d0c46287d508236506ee59417e8da05c0cee3e5 (diff) | |
| parent | db287e1579a46cdc8d8d6e1ef10455d2b1f10f22 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | toolchain/eglibc/Makefile | 1 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 9 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 11 |
3 files changed, 17 insertions, 4 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index d6cf99e27..aeec91c90 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -44,7 +44,6 @@ $(WRKBUILD)/.headers_configure: mkdir -p $(EGLIBC_BUILD_DIR_INITIAL) (cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \ ln -sf ../ports ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc); - #(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force); $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ $(EGLIBC_BUILD_DIR_INITIAL) (cd $(EGLIBC_BUILD_DIR_INITIAL); \ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 619ddf47c..0fc5edc1d 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -17,6 +17,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \ --disable-libmudflap \ --disable-libgomp \ --disable-biarch \ + --disable-decimal-float \ --disable-multilib \ --disable-sjlj-exceptions \ --disable-libssp \ @@ -56,7 +57,7 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured: $(GCC_BUILD_DIR_MINIMAL)/.compiled: $(GCC_BUILD_DIR_MINIMAL)/.configured PATH=$(TARGET_PATH) \ - $(MAKE) -C $(GCC_BUILD_DIR_MINIMAL) all-gcc + $(MAKE) -C $(GCC_BUILD_DIR_MINIMAL) all-gcc touch $@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled @@ -76,6 +77,8 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: ${GCC_CONFOPTS} \ --enable-languages=c \ --disable-shared \ + --disable-threads \ + --with-newlib \ --with-sysroot=$(TOOLCHAIN_SYSROOT) \ ); touch $@ @@ -83,12 +86,12 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured PATH=$(TARGET_PATH) \ - $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) all + $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc touch $@ $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled PATH=$(TARGET_PATH) \ - $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install + $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install-gcc install-target-libgcc touch $@ $(GCC_BUILD_DIR_FINAL)/.configured: diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 2b3fc252f..978794dc9 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -57,11 +57,22 @@ $(WRKBUILD)/.headers_configure: touch $@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure + mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib $(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \ cross-compiling=yes \ install_root=$(TOOLCHAIN_SYSROOT) \ install-headers touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h + PATH='${TARGET_PATH}' \ + $(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \ + csu/subdir_lib + ( cd $(GLIBC_BUILD_DIR_INITIAL); \ + $(CP) csu/crt1.o csu/crti.o csu/crtn.o \ + $(TOOLCHAIN_SYSROOT)/usr/lib \ + ); + PATH='${TARGET_PATH}' \ + $(TARGET_CC) -nostdlib -nostartfiles -shared -x c /dev/null \ + -o $(TOOLCHAIN_SYSROOT)/usr/lib/libc.so touch $@ $(WRKBUILD)/.configured: |