diff options
Diffstat (limited to 'toolchain')
-rw-r--r-- | toolchain/Config.in | 18 | ||||
-rw-r--r-- | toolchain/Makefile | 6 | ||||
-rw-r--r-- | toolchain/binutils/Makefile | 1 | ||||
-rw-r--r-- | toolchain/eglibc/Makefile | 12 | ||||
-rw-r--r-- | toolchain/gcc/Makefile | 25 | ||||
-rw-r--r-- | toolchain/glibc/Makefile | 11 | ||||
-rw-r--r-- | toolchain/glibc/Makefile.inc | 2 | ||||
-rw-r--r-- | toolchain/kernel-headers/Makefile | 5 | ||||
-rw-r--r-- | toolchain/libelf/Makefile | 31 | ||||
-rw-r--r-- | toolchain/libelf/Makefile.inc | 8 | ||||
-rw-r--r-- | toolchain/uClibc/Makefile | 18 |
11 files changed, 102 insertions, 35 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in index b85fd6056..06f0c468a 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -15,6 +15,11 @@ config ADK_TOOLCHAIN_GCC_JAVA boolean default n +config ADK_TOOLCHAIN_GCC_OBJC + prompt "Enable building of Objective C compiler" + boolean + default n + config ADK_TOOLCHAIN_GCC_SSP prompt "Enable Stack Smashing Protection in GCC" boolean @@ -25,5 +30,16 @@ config ADK_TOOLCHAIN_GCC_USE_SSP boolean depends on ADK_TOOLCHAIN_GCC_SSP default n - + +config ADK_TOOLCHAIN_GCC_LTO + prompt "Enable Link Time Optimization in GCC" + boolean + default n + +config ADK_TOOLCHAIN_GCC_USE_LTO + prompt "Use Link Time Optimization for all packages" + boolean + depends on ADK_TOOLCHAIN_GCC_LTO + default n + endmenu diff --git a/toolchain/Makefile b/toolchain/Makefile index 34bd57210..e3c04a85a 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -3,7 +3,7 @@ # # Steps to build toolchains # 1) build and install binutils -# 2) build and install mpfr, mpc and gmp +# 2) build and install mpfr, mpc, libelf and gmp # 3) build and install gcc c compiler # 4) install kernel-headers # 5) install libc headers @@ -13,7 +13,7 @@ include $(TOPDIR)/rules.mk -TARGETS:=binutils gmp mpfr mpc gcc +TARGETS:=binutils gmp mpfr mpc libelf gcc ifeq ($(ADK_TARGET_LIB_GLIBC),y) TARGETS+=glibc-ports glibc LIBC:=glibc @@ -38,7 +38,7 @@ install: $(TARGETS_INSTALL) clean: $(TARGETS_CLEAN) download: $(DOWNLOAD) -gcc-prepare: binutils-install gmp-install mpfr-install mpc-install +gcc-prepare: binutils-install gmp-install mpfr-install mpc-install libelf-install ifeq ($(ADK_TARGET_LIB_GLIBC),y) $(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare else diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 2b0137db9..cc8c1b26a 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -28,7 +28,6 @@ $(WRKBUILD)/.configured: --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ - --with-sysroot=$(TOOLCHAIN_SYSROOT) \ --with-sysroot=$(STAGING_TARGET_DIR) \ --disable-multilib \ --disable-dependency-tracking \ diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 2db3fa6f6..c5f2a5653 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -50,8 +50,8 @@ $(WRKBUILD)/.headers_configure: (cd $(EGLIBC_BUILD_DIR_INITIAL); \ ${EGLIBC_ENV} \ $(WRKBUILD)/libc/configure \ - --prefix=$(TOOLCHAIN_SYSROOT)/usr \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --prefix=$(STAGING_TARGET_DIR)/usr \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ ${EGLIBC_CONFOPTS} \ ); touch $@ @@ -61,9 +61,15 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure PATH='${TARGET_PATH}' \ $(MAKE) install-headers install-bootstrap-headers=yes \ ); - touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h touch $@ +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +EGLIBC_ENV+= libc_cv_ssp=yes +else +EGLIBC_ENV+= libc_cv_ssp=no +endif + $(WRKBUILD)/.configured: mkdir -p $(EGLIBC_BUILD_DIR_FINAL) $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b881473de..afb945000 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -11,6 +11,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_HOST_DIR) \ --target=$(REAL_GNU_TARGET_NAME) \ --with-gmp=$(STAGING_HOST_DIR) \ --with-mpfr=$(STAGING_HOST_DIR) \ + --with-libelf=$(STAGING_HOST_DIR) \ --disable-__cxa_atexit \ --with-gnu-ld \ --disable-libmudflap \ @@ -32,6 +33,12 @@ else GCC_CONFOPTS+= --disable-libssp endif +ifeq ($(ADK_TOOLCHAIN_GCC_LTO),y) +GCC_CONFOPTS+= --enable-lto +else +GCC_CONFOPTS+= --disable-lto +endif + ifeq ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else @@ -67,6 +74,9 @@ endif ifeq ($(ADK_TOOLCHAIN_GCC_JAVA),y) LANGUAGES:=${LANGUAGES},java endif +ifeq ($(ADK_TOOLCHAIN_GCC_ADA),y) +LANGUAGES:=${LANGUAGES},ada +endif include ${TOPDIR}/mk/buildhlp.mk @@ -76,7 +86,7 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final $(GCC_BUILD_DIR_MINIMAL)/.configured: mkdir -p $(GCC_BUILD_DIR_MINIMAL) - (cd $(GCC_BUILD_DIR_MINIMAL); rm -f config.cache; \ + (cd $(GCC_BUILD_DIR_MINIMAL); \ PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ @@ -98,12 +108,8 @@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled touch $@ $(GCC_BUILD_DIR_INITIAL)/.configured: - rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - ln -sf ${STAGING_TARGET_DIR}/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib - ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib mkdir -p $(GCC_BUILD_DIR_INITIAL) - (cd $(GCC_BUILD_DIR_INITIAL); rm -f config.cache; \ + (cd $(GCC_BUILD_DIR_INITIAL); \ PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ @@ -111,7 +117,7 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: --disable-shared \ --disable-threads \ --with-newlib \ - --with-sysroot=$(TOOLCHAIN_SYSROOT) \ + --with-sysroot=$(STAGING_TARGET_DIR) \ ); touch $@ @@ -128,7 +134,7 @@ $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled $(GCC_BUILD_DIR_FINAL)/.configured: mkdir -p $(GCC_BUILD_DIR_FINAL) - (cd $(GCC_BUILD_DIR_FINAL); rm -f config.cache; \ + (cd $(GCC_BUILD_DIR_FINAL); \ PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ @@ -146,9 +152,6 @@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install - # workaround if you cross-compile binutils - @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a - @-rm $(STAGING_TARGET_DIR)/usr/lib/libiberty.a # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_HOST_DIR); \ diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 4d39e2b27..96dc99302 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -31,21 +31,21 @@ $(WRKBUILD)/.headers_configure: (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(WRKBUILD)/configure \ - --prefix=$(TOOLCHAIN_SYSROOT)/usr \ - --with-sysroot=$(TOOLCHAIN_SYSROOT) \ + --prefix=$(STAGING_TARGET_DIR)/usr \ + --with-sysroot=$(STAGING_TARGET_DIR) \ ${GLIBC_CONFOPTS} \ ); touch $@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure - mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib + mkdir -p $(STAGING_TARGET_DIR)/usr/lib (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(MAKE) ${GLIBC_MAKEOPTS} \ cross-compiling=yes \ install-headers \ ); - touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h touch $@ $(WRKBUILD)/.configured: @@ -67,7 +67,6 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.installed: ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) \ install_root=$(STAGING_TARGET_DIR) install - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(WRKBUILD)/.installed + touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index ff4753465..d7bcecb13 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -9,7 +9,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_PORTS_VERSION:= 2.12 GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ --disable-nls \ --disable-sanity-checks \ --disable-nls \ diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 45160fab1..81c2b6593 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -11,9 +11,6 @@ $(WRKBUILD)/.headers: INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \ headers_install $(MAKE) -C $(WRKBUILD) HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ - INSTALL_HDR_PATH=$(TOOLCHAIN_SYSROOT)/usr \ - headers_install - $(MAKE) -C $(WRKBUILD) HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(LINUX_HEADER_DIR) \ headers_install # cryptodev.h from ocf-linux-20080917 @@ -22,10 +19,8 @@ $(WRKBUILD)/.headers: ifeq ($(ARCH),cris) ifeq ($(CPU_ARCH),crisv32) cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v32/arch arch - cd $(TOOLCHAIN_SYSROOT)/usr/include && ln -sf arch-v32/arch arch else cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v10/arch arch - cd $(TOOLCHAIN_SYSROOT)/usr/include && ln -sf arch-v10/arch arch endif endif touch $@ diff --git a/toolchain/libelf/Makefile b/toolchain/libelf/Makefile new file mode 100644 index 000000000..485978cf0 --- /dev/null +++ b/toolchain/libelf/Makefile @@ -0,0 +1,31 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk +include Makefile.inc +include ../rules.mk +include ${TOPDIR}/mk/buildhlp.mk + +ifeq (${ADK_MAKE_PARALLEL},y) +LIBELF_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + +$(WRKBUILD)/.headers: +$(WRKBUILD)/.configured: + (cd $(WRKBUILD); \ + $(WRKBUILD)/configure \ + --prefix=$(STAGING_HOST_DIR) \ + --disable-shared \ + --enable-static \ + ); + touch $@ + +$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured + $(MAKE) ${LIBELF_MAKEOPTS} -C $(WRKBUILD) all + touch $@ + +$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled + $(MAKE) -C $(WRKBUILD) install + touch $@ + +include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/libelf/Makefile.inc b/toolchain/libelf/Makefile.inc new file mode 100644 index 000000000..66ca9fd2c --- /dev/null +++ b/toolchain/libelf/Makefile.inc @@ -0,0 +1,8 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +PKG_NAME:= libelf +PKG_VERSION:= 0.8.13 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 4136d7b4c04df68b686570afa26988ac +PKG_SITES:= http://www.mr511.de/software/ diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index e04985dac..cc63b9e5f 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -14,18 +14,28 @@ endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak - sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \ + sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ $(TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc.config >${WRKBUILD}/.config ifneq ($(ADK_DEBUG),) $(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config endif -ifneq ($(ADK_TOOLCHAIN_GCC_SSP),) +ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) $(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config + echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config + echo "SSP_QUICK_CANARY=n" >> ${WRKBUILD}/.config + echo "UCLIBC_BUILD_SSP=y" >> ${WRKBUILD}/.config endif + echo N|$(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + PREFIX=$(STAGING_TARGET_DIR) \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ + HOSTCC="$(HOSTCC)" \ + CPU_CFLAGS="$(TARGET_CFLAGS)" \ + oldconfig $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ - PREFIX=$(TOOLCHAIN_SYSROOT) \ + PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=$(TOOLCHAIN_SYSROOT) \ + RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ HOSTCC="$(HOSTCC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ install_headers |