diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-17 07:27:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-17 07:27:01 +0100 |
| commit | a07e197d7552bed16d7c9bf428d4a43a3f458a23 (patch) | |
| tree | da39ede4c33e62e1124ffd15d27c41cbe1c1f64c /toolchain | |
| parent | 753383bdf29033a1c7244e31c42c2f5d9906010f (diff) | |
| parent | f91c0a6d288596bf002df4f750ab77e0c241e924 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Makefile | 30 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile.inc | 6 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.9.2/cflags.patch (renamed from toolchain/gcc/patches/4.9.1/cflags.patch) | 0 | ||||
| -rw-r--r-- | toolchain/libelf/Makefile | 11 |
4 files changed, 25 insertions, 22 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index dc59bfd35..ccf0b4b69 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -126,28 +126,20 @@ GCC_CONFOPTS+= --with-fpu=$(ADK_TARGET_FPU) endif endif -ifeq ($(ADK_CPU_ARMV5TE),y) -GCC_CONFOPTS+= --with-arch=armv5te -endif - -ifeq ($(ADK_CPU_ARMV6),y) -GCC_CONFOPTS+= --with-arch=armv6 -endif - -ifeq ($(ADK_CPU_ARMV7A),y) -GCC_CONFOPTS+= --with-arch=armv7-a -endif - ifeq ($(ADK_CPU_ARM926EJ_S),y) -GCC_CONFOPTS+= --with-arch=armv5te --with-tune=arm926ej-s +GCC_CONFOPTS+= --with-cpu=arm926ej-s endif ifeq ($(ADK_CPU_ARM1176JZF_S),y) -GCC_CONFOPTS+= --with-arch=armv6 --with-tune=arm1176jzf-s +GCC_CONFOPTS+= --with-cpu=arm1176jzf-s +endif + +ifeq ($(ADK_CPU_CORTEX_M3),y) +GCC_CONFOPTS+= --with-cpu=cortex-m3 --with-mode=thumb endif ifeq ($(ADK_CPU_CORTEX_A9),y) -GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 +GCC_CONFOPTS+= --with-cpu=cortex-a9 endif ifeq ($(ADK_CPU_SPARC_V9),y) @@ -202,8 +194,8 @@ endif $(SED) '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure cd $(GCC_BUILD_DIR_MINIMAL); \ PATH='$(TARGET_PATH)' \ - CFLAGS="-O0 -g0" \ - CXXFLAGS="-O0 -g0" \ + CFLAGS="-O0 -g0 -fomit-frame-pointer" \ + CXXFLAGS="-O0 -g0 -fomit-frame-pointer" \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ --enable-languages=c \ @@ -224,8 +216,8 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: mkdir -p $(GCC_BUILD_DIR_INITIAL) cd $(GCC_BUILD_DIR_INITIAL); \ PATH='$(TARGET_PATH)' \ - CFLAGS="-O0 -g0" \ - CXXFLAGS="-O0 -g0" \ + CFLAGS="-O0 -g0 -fomit-frame-pointer" \ + CXXFLAGS="-O0 -g0 -fomit-frame-pointer" \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ ${GCC_FINAL_CONFOPTS} \ diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 2a616adbd..e522805f2 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -2,9 +2,9 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gcc -ifeq ($(ADK_TOOLCHAIN_GCC_4_9_1),y) -PKG_VERSION:= 4.9.1 -PKG_MD5SUM:= b188a3c9be25ddbf36b4fa6f04aaafaa +ifeq ($(ADK_TOOLCHAIN_GCC_4_9_2),y) +PKG_VERSION:= 4.9.2 +PKG_MD5SUM:= 76f464e0511c26c93425a9dcdc9134cf PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/toolchain/gcc/patches/4.9.1/cflags.patch b/toolchain/gcc/patches/4.9.2/cflags.patch index d4119cd39..d4119cd39 100644 --- a/toolchain/gcc/patches/4.9.1/cflags.patch +++ b/toolchain/gcc/patches/4.9.2/cflags.patch diff --git a/toolchain/libelf/Makefile b/toolchain/libelf/Makefile index dbb0b9fb8..4d1b81164 100644 --- a/toolchain/libelf/Makefile +++ b/toolchain/libelf/Makefile @@ -12,6 +12,17 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: + @cd ${WRKBUILD}; \ + for i in $$(find . -name config.sub);do \ + if [ -f $$i ]; then \ + ${CP} ${SCRIPT_DIR}/config.sub $$i; \ + fi; \ + done; \ + for i in $$(find . -name config.guess);do \ + if [ -f $$i ]; then \ + ${CP} ${SCRIPT_DIR}/config.guess $$i; \ + fi; \ + done; (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_HOST_DIR)/usr \ |