summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/buildroot/ChangeLog2
-rw-r--r--misc/buildroot/Config.in3
-rw-r--r--misc/buildroot/configs/README.txt6
-rw-r--r--misc/buildroot/configs/cortexm3-defconfig-4.3.3110
-rw-r--r--misc/buildroot/toolchain/gcc/Config.in104
-rw-r--r--misc/buildroot/toolchain/gcc/Config.in.215
-rw-r--r--misc/buildroot/toolchain/gcc/Makefile.in14
7 files changed, 131 insertions, 123 deletions
diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog
index a79788b61..3e3496b38 100644
--- a/misc/buildroot/ChangeLog
+++ b/misc/buildroot/ChangeLog
@@ -33,3 +33,5 @@ buildroot-0.1.5 2009-xx-xx <spudmonkey@racsa.co.cr>
and config/arm926t-defconfig-4.2.4 because of differences in the
way that soft floating point is handled between these two
architectures.
+ * Add support for gcc-4.3.3 and the ARM Cortex-M3 processor (not yet
+ verified)
diff --git a/misc/buildroot/Config.in b/misc/buildroot/Config.in
index 46a3c62a5..dfad6bdbb 100644
--- a/misc/buildroot/Config.in
+++ b/misc/buildroot/Config.in
@@ -209,6 +209,7 @@ config BR2_GCC_TARGET_TUNE
default arm922t if BR2_arm922t
default arm9tdmi if BR2_arm926t
default arm1136jf-s if BR2_arm1136jf_s
+ default cortex-M3 if BR2_cortex_m3
default strongarm110 if BR2_sa110
default strongarm1100 if BR2_sa1100
default xscale if BR2_xscale
@@ -224,9 +225,9 @@ config BR2_GCC_TARGET_ARCH
default armv4 if BR2_sa110 || BR2_sa1100
default armv4t if BR2_arm7tdmi
default armv4t if BR2_arm720t || BR2_arm920t || BR2_arm922t
- default armv5t if BR2_cortex_m3 # Use armv7-m if available
default armv5te if BR2_arm926t || BR2_arm10t || BR2_xscale
default armv6j if BR2_arm1136jf_s
+ default armv7-m if BR2_cortex_m3
default iwmmxt if BR2_iwmmxt
config BR2_GCC_TARGET_ABI
diff --git a/misc/buildroot/configs/README.txt b/misc/buildroot/configs/README.txt
index 08776dc2f..86a500ecf 100644
--- a/misc/buildroot/configs/README.txt
+++ b/misc/buildroot/configs/README.txt
@@ -17,6 +17,12 @@ arm926t-defconfig-4.2.4
due to improperly positioned sections and can probably fixed
by changing the architectures .ldscript file.
+cortexm3-defconfig-4.3.3
+ Builds an ARM toolchain for the Cortex-M3 using gcc 4.3.3.
+ This configuration builds both gcc and g++.
+
+ NOTE: This configuration is untested as of this writing.
+
bfin-defconfig-4.2.4
Builds an Blackfin toolchain using gcc 4.2.4
diff --git a/misc/buildroot/configs/cortexm3-defconfig-4.3.3 b/misc/buildroot/configs/cortexm3-defconfig-4.3.3
new file mode 100644
index 000000000..8bbe406f1
--- /dev/null
+++ b/misc/buildroot/configs/cortexm3-defconfig-4.3.3
@@ -0,0 +1,110 @@
+#
+# Automatically generated make config: don't edit
+#
+BR2_HAVE_DOT_CONFIG=y
+# BR2_alpha is not set
+BR2_arm=y
+# BR2_armeb is not set
+# BR2_avr32 is not set
+# BR2_bfin is not set
+# BR2_cris is not set
+# BR2_i386 is not set
+# BR2_m32c is not set
+# BR2_m68k is not set
+# BR2_m68hc11 is not set
+# BR2_m68hc12 is not set
+# BR2_mips is not set
+# BR2_mipsel is not set
+# BR2_nios2 is not set
+# BR2_powerpc is not set
+# BR2_sh is not set
+# BR2_sh64 is not set
+# BR2_h8300 is not set
+# BR2_sparc is not set
+# BR2_x86_64 is not set
+# BR2_generic_arm is not set
+# BR2_arm610 is not set
+# BR2_arm710 is not set
+# BR2_arm720t is not set
+# BR2_arm740t is not set
+# BR2_arm920t is not set
+# BR2_arm922t is not set
+# BR2_arm926t is not set
+# BR2_arm1136jf_s is not set
+BR2_cortex_m3=y
+# BR2_sa110 is not set
+# BR2_sa1100 is not set
+# BR2_xscale is not set
+# BR2_iwmmxt is not set
+BR2_ARM_OABI=y
+# BR2_ARM_EABI is not set
+BR2_ARCH="arm"
+BR2_GCC_TARGET_TUNE="cortex-M3"
+BR2_GCC_TARGET_ARCH="armv7-m"
+BR2_GCC_TARGET_ABI="apcs-gnu"
+BR2_ENDIAN="LITTLE"
+
+#
+# Build options
+#
+BR2_WGET="wget --passive-ftp"
+BR2_SVN="svn co"
+BR2_ZCAT="zcat"
+BR2_BZCAT="bzcat"
+BR2_TAR_OPTIONS=""
+BR2_DL_DIR="$(BASE_DIR)/../archives"
+BR2_SOURCEFORGE_MIRROR="easynews"
+BR2_ATMEL_MIRROR="ftp://at91dist:distrib@81.80.104.162/AT91_Third_Party_Design_Flow/Linux_Host/"
+BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
+BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
+BR2_TOPDIR_PREFIX=""
+BR2_TOPDIR_SUFFIX=""
+BR2_GNU_BUILD_SUFFIX="arm-elf"
+BR2_GNU_TARGET_SUFFIX="elf"
+# BR2_PREFER_IMA is not set
+# BR2_DEPRECATED is not set
+
+#
+# Toolchain Options
+#
+
+#
+# Binutils Options
+#
+# BR2_BINUTILS_VERSION_2_17 is not set
+BR2_BINUTILS_VERSION_2_19=y
+BR2_BINUTILS_VERSION="2.19"
+BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
+
+#
+# GCC Options
+#
+# BR2_GCC_VERSION_3_4_6 is not set
+# BR2_GCC_VERSION_4_2_4 is not set
+BR2_GCC_VERSION_4_3_3=y
+BR2_GCC_SUPPORTS_SYSROOT=y
+BR2_GCC_VERSION="4.3.3"
+# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
+BR2_EXTRA_GCC_CONFIG_OPTIONS=""
+BR2_INSTALL_LIBSTDCPP=y
+# BR2_INSTALL_LIBGCJ is not set
+# BR2_INSTALL_OBJC is not set
+# BR2_INSTALL_FORTRAN is not set
+
+#
+# Gdb Options
+#
+# BR2_PACKAGE_GDB is not set
+# BR2_PACKAGE_GDB_SERVER is not set
+# BR2_PACKAGE_GDB_HOST is not set
+
+#
+# Common Toolchain Options
+#
+# BR2_PACKAGE_SSTRIP_TARGET is not set
+# BR2_PACKAGE_SSTRIP_HOST is not set
+# BR2_ENABLE_MULTILIB is not set
+BR2_LARGEFILE=y
+BR2_SOFT_FLOAT=y
+BR2_TARGET_OPTIMIZATION="-Os -pipe"
diff --git a/misc/buildroot/toolchain/gcc/Config.in b/misc/buildroot/toolchain/gcc/Config.in
index 5b5414386..b8a25e64f 100644
--- a/misc/buildroot/toolchain/gcc/Config.in
+++ b/misc/buildroot/toolchain/gcc/Config.in
@@ -4,80 +4,26 @@ comment "GCC Options"
choice
prompt "GCC compiler Version"
- default BR2_GCC_VERSION_4_2_4 if !BR2_avr32
- default BR2_GCC_VERSION_3_4_6 if BR2_avr32
+ default BR2_GCC_VERSION_4_3_3 if BR2_cortex_m3
+ default BR2_GCC_VERSION_4_2_4 if !BR2_avr32 && !BR2_cortex_m3
+ default BR2_GCC_VERSION_3_4_6 if BR2_avr32 && !BR2_cortex_m3
help
Select the version of gcc you wish to use.
-# config BR2_GCC_VERSION_3_3_5
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 3.3.5"
-
-# config BR2_GCC_VERSION_3_3_6
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 3.3.6"
-
-# config BR2_GCC_VERSION_3_4_2
-# depends BR2_DEPRECATED
-# bool "gcc 3.4.2"
-
-# config BR2_GCC_VERSION_3_4_3
-# depends BR2_DEPRECATED
-# bool "gcc 3.4.3"
-
-# config BR2_GCC_VERSION_3_4_4
-# depends BR2_DEPRECATED
-# bool "gcc 3.4.4"
-
-# config BR2_GCC_VERSION_3_4_5
-# depends BR2_DEPRECATED
-# bool "gcc 3.4.5"
-
config BR2_GCC_VERSION_3_4_6
- depends on !BR2_m32c
+ depends on !BR2_m32c && !BR2_cortex_m3
bool "gcc 3.4.6"
-# config BR2_GCC_VERSION_4_0_0
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.0.0"
-
-# config BR2_GCC_VERSION_4_0_1
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.0.1"
-
-# config BR2_GCC_VERSION_4_0_2
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.0.2"
-
-# config BR2_GCC_VERSION_4_0_3
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.0.3"
-
-# config BR2_GCC_VERSION_4_0_4
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.0.4"
-
-# config BR2_GCC_VERSION_4_1_0
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.1.0"
-
-# config BR2_GCC_VERSION_4_1_1
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.1.1"
-
-# config BR2_GCC_VERSION_4_1_2
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.1.2"
-
-# config BR2_GCC_VERSION_4_2
-# depends !BR2_nios2 && BR2_DEPRECATED
-# bool "gcc 4.2"
-
config BR2_GCC_VERSION_4_2_4
- depends on !BR2_avr32 && !BR2_nios2
+ depends on !BR2_avr32 && !BR2_nios2 && !BR2_cortex_m3
select BR2_GCC_SUPPORTS_SYSROOT
bool "gcc 4.2.4"
+ config BR2_GCC_VERSION_4_3_3
+ depends on !BR2_avr32 && !BR2_nios2
+ select BR2_GCC_SUPPORTS_SYSROOT
+ bool "gcc 4.3.3"
+
endchoice
config BR2_GCC_SUPPORTS_SYSROOT
@@ -86,37 +32,9 @@ config BR2_GCC_SUPPORTS_SYSROOT
config BR2_GCC_VERSION
string
-# default "3.3.5" if BR2_GCC_VERSION_3_3_5
-# default "3.3.6" if BR2_GCC_VERSION_3_3_6
-# default "3.4.2" if BR2_GCC_VERSION_3_4_2
-# default "3.4.3" if BR2_GCC_VERSION_3_4_3
-# default "3.4.4" if BR2_GCC_VERSION_3_4_4
-# default "3.4.5" if BR2_GCC_VERSION_3_4_5
default "3.4.6" if BR2_GCC_VERSION_3_4_6
-# default "4.0.0" if BR2_GCC_VERSION_4_0_0
-# default "4.0.1" if BR2_GCC_VERSION_4_0_1
-# default "4.0.2" if BR2_GCC_VERSION_4_0_2
-# default "4.0.3" if BR2_GCC_VERSION_4_0_3
-# default "4.0.4" if BR2_GCC_VERSION_4_0_4
-# default "4.1.0" if BR2_GCC_VERSION_4_1_0
-# default "4.1.1" if BR2_GCC_VERSION_4_1_1
-# default "4.1.2" if BR2_GCC_VERSION_4_1_2
-# default "4.2" if BR2_GCC_VERSION_4_2
default "4.2.4" if BR2_GCC_VERSION_4_2_4
-
-#config BR2_TOOLCHAIN_SYSROOT
-# bool "Enable toolchain with --sysroot support"
-# depends on BR2_GCC_SUPPORTS_SYSROOT
-# default y
-# help
-# Enables --sysroot=dir for binutils and gcc.
-# Use dir as the logical root directory for headers and libraries.
-# For example, if the compiler would normally search for headers in
-# /usr/include and libraries in /usr/lib, it will instead search
-# dir/usr/include and dir/usr/lib.
-#
-# This does not work with gcc < 4.2.0 (4.1.2 gets
-# ORIGINAL_AS_FOR_TARGET wrong)
+ default "4.3.3" if BR2_GCC_VERSION_4_3_3
config BR2_GCC_USE_SJLJ_EXCEPTIONS
bool "Enable setjmp/longjmp exceptions?"
diff --git a/misc/buildroot/toolchain/gcc/Config.in.2 b/misc/buildroot/toolchain/gcc/Config.in.2
deleted file mode 100644
index 2275ce34b..000000000
--- a/misc/buildroot/toolchain/gcc/Config.in.2
+++ /dev/null
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_GCC_TARGET
- bool "native toolchain in the target filesystem"
- default n
- help
- If you want the target system to be able to run
- binutils/gcc and compile native code, say Y here.
-
-config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
- string "Additional target gcc options"
- default ""
- depends on BR2_PACKAGE_GCC_TARGET
- help
- Any additional target gcc options you may want to include....
- Including, but not limited to --disable-checking etc.
- Refer to */configure in your gcc sources.
diff --git a/misc/buildroot/toolchain/gcc/Makefile.in b/misc/buildroot/toolchain/gcc/Makefile.in
index 54b81a51b..895f345d7 100644
--- a/misc/buildroot/toolchain/gcc/Makefile.in
+++ b/misc/buildroot/toolchain/gcc/Makefile.in
@@ -57,17 +57,3 @@ ifneq ($(strip $(subst ",,$(BR2_GCC_TARGET_ABI))),)
# ")))
GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
endif
-
-ifeq ($(strip $(BR2_PACKAGE_GCC_TARGET)),y)
-# pull in config opts from the user
-EXTRA_TARGET_GCC_CONFIG_OPTIONS:=$(strip $(subst ",, $(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS)))
-#"))
-
-ifeq ($(BR2_PREFER_IMA),y)
-# >= 4.x
-ifneq ($(findstring 3.,$(GCC_VERSION)),3.)
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--enable-intermodule
-endif
-endif # BR2_PREFER_IMA=y
-
-endif