diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-20 15:02:29 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-20 15:02:29 +0100 |
| commit | f319f27987a02309892fbf87649ef494e885d7c3 (patch) | |
| tree | 2c9e8c299560b35e48085ecbd8e8178613e6f718 | |
| parent | 079673bd4c63480523590cc2542dd0642f6e5acb (diff) | |
| parent | 84af1b9633858c9ef5798c8c8793023044cd9fad (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 3 | ||||
| -rw-r--r-- | mk/vars.mk | 2 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index 08d3d01e1..cb2bf9be9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -122,6 +122,9 @@ POSTCONFIG= -@\ if [ "$$(grep ^ADK_KERNEL_VERSION_ .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION_ .config.old|md5sum)" ];then \ make kernelclean;\ fi; \ + if [ "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config|md5sum)" != "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config.old|md5sum)" ];then \ + echo "You should make cleantarget, after changing thumb mode";\ + fi; \ if [ $$rebuild -eq 1 ];then \ cp .config .config.old;\ fi; \ diff --git a/mk/vars.mk b/mk/vars.mk index ae290e9a4..4b0c4dbb9 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -87,7 +87,7 @@ TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(ADK_TARGET_ABI_CFLAG TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(TARGET_OPTIMIZATION) else TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(ADK_TARGET_ABI_CFLAGS) $(MODE_FLAGS) -TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) +TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) $(MODE_FLAGS) endif TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(MODE_FLAGS) TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 7566d3f20..32710c9bd 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -94,7 +94,11 @@ GCC_CONFOPTS+= --with-arch=armv6 --with-tune=arm1176jzf-s --with-fpu=vf endif ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y) -GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard +ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y) +GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard --with-mode=thumb +else +GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard --with-mode=arm +endif endif ifneq ($(ADK_TARGET_ABI),) |