diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-19 07:23:50 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-19 07:23:50 +0100 |
| commit | 7af345e70ac9f56d9f038b73d0333b3ee2c19c07 (patch) | |
| tree | 548bcdd3442c361653d738a694059eb7c9a04720 | |
| parent | a5d38b1d44a86e3ea90e3192b5eb1ae75ac4168e (diff) | |
| parent | 9bed26e23fd8d3aa6e8fd40bcb5b0a25dd9d6a36 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/vars.mk | 13 | ||||
| -rw-r--r-- | target/config/Config.in | 13 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 3 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 4 |
4 files changed, 29 insertions, 4 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index eacf12395..540d0e03b 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -72,15 +72,24 @@ TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld +MODE_FLAGS:= +ifeq ($(ADK_LINUX_ARM),y) +ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y) +MODE_FLAGS:= -mthumb +else +MODE_FLAGS:= -marm +endif +endif + TARGET_CPPFLAGS:= ifeq ($(ADK_LINUX_MICROBLAZE),y) TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(ADK_TARGET_ABI_CFLAGS) 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) +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) endif -TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident +TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident $(MODE_FLAGS) TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-O1 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ diff --git a/target/config/Config.in b/target/config/Config.in index 12e2b8003..6cab5a99d 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -173,6 +173,19 @@ config ADK_TARGET_KERNEL_MINICONFIG default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I choice +prompt "Use ARM thumb mode" +depends on ADK_TARGET_SYSTEM_CUBOX_I + +config ADK_LINUX_ARM_WITHOUT_THUMB + boolean "disabled" + +config ADK_LINUX_ARM_WITH_THUMB + boolean "enabled" + select ADK_KERNEL_THUMB2_KERNEL + +endchoice + +choice prompt "Qemu Emulation using VirtIO drivers" depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 785ae6475..bd4169948 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -101,3 +101,6 @@ config ADK_KERNEL_CPU_MIPS64_R1 config ADK_KERNEL_PREEMPT boolean + +config ADK_KERNEL_THUMB2_KERNEL + boolean diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 306927fc6..0905f2f61 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk include ../rules.mk # glibc does not compile with Os -TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS)) +TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS_LIBC)) ifneq ($(ADK_DEBUG),) TARGET_CFLAGS_LIBC+= -O2 endif # ssp partially supported -TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS)) +TARGET_CFLAGS_LIBC:= $(filter-out -fstack-protector,$(TARGET_CFLAGS_LIBC)) include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk |