diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-27 21:28:34 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-27 21:28:34 -0600 |
commit | b9fd031631b1d044334399a1f2345e8d952aa5a5 (patch) | |
tree | 698a9c1d447a1cd04a745fc111ddb3827e0c367a /misc/buildroot | |
parent | 71aed89255ec34ef94150cbaf131befcde5d8595 (diff) | |
download | px4-nuttx-b9fd031631b1d044334399a1f2345e8d952aa5a5.tar.gz px4-nuttx-b9fd031631b1d044334399a1f2345e8d952aa5a5.tar.bz2 px4-nuttx-b9fd031631b1d044334399a1f2345e8d952aa5a5.zip |
Binutils 2.4 wants us to include config.h before bfd.h
Diffstat (limited to 'misc/buildroot')
-rw-r--r-- | misc/buildroot/ChangeLog | 2 | ||||
-rw-r--r-- | misc/buildroot/configs/README.txt | 6 | ||||
-rw-r--r-- | misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 | 6 | ||||
-rw-r--r-- | misc/buildroot/toolchain/nxflat/ldnxflat.c | 1 | ||||
-rw-r--r-- | misc/buildroot/toolchain/nxflat/mknxflat.c | 4 |
5 files changed, 17 insertions, 2 deletions
diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog index 6ed11b186..aa87dd9a5 100644 --- a/misc/buildroot/ChangeLog +++ b/misc/buildroot/ChangeLog @@ -147,4 +147,6 @@ buildroot-1.14 2011-xx-xx <gnutt@nuttx.org> * Support for the Cortex-M4F (with hardware floating point). Also from David Alessio (2014-2-18). * Added a Cortex-M3 GCC 4.8.2 EABI configuration (2014-2-27). + * toolchain/nxflat/ldnxflat.c and mknxflat.c: Fix error with binutils-2.4: + bfd.h wants us to include config.h first (2014-2.27). diff --git a/misc/buildroot/configs/README.txt b/misc/buildroot/configs/README.txt index c7bce461a..a23a2313b 100644 --- a/misc/buildroot/configs/README.txt +++ b/misc/buildroot/configs/README.txt @@ -79,6 +79,10 @@ cortexm3-eabi-defconfig-4.6.3 Builds an EABI ARM toolchain for the Cortex-M3 using gcc 4.6.3. This configuration builds gcc, g++ and the NXFLAT toolchain. +cortexm3-eabi-defconfig-4.8.2 + Builds an EABI ARM toolchain for the Cortex-M3 using gcc 4.8.2. + This configuration builds gcc, g++ and the NXFLAT toolchain. + cortexm3-defconfig-nxflat This configuration build an NXFLAT toolchain (only) for use with the Cortex-M3. @@ -359,4 +363,4 @@ Building GDB Under Cygwin directory if it is needed: cp configs/gdb-1_8-cygwin-1_7.patch toolchain/gdb/6.8/. -
\ No newline at end of file + diff --git a/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 b/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 index bf5590527..27d743919 100644 --- a/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 +++ b/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 @@ -37,11 +37,14 @@ BR2_arm=y # BR2_cortex_a5 is not set # BR2_cortex_a8 is not set BR2_cortex_m3=y +# BR2_cortex_m4f is not set # BR2_cortex_m0 is not set # BR2_sa110 is not set # BR2_sa1100 is not set # BR2_xscale is not set # BR2_iwmmxt is not set +BR2_GCC_CORTEX=y +# BR2_GCC_CORTEX_M4F is not set # BR2_ARM_OABI is not set BR2_ARM_EABI=y BR2_ARCH="arm" @@ -80,6 +83,7 @@ BR2_GNU_TARGET_SUFFIX="nuttx-eabi" # BR2_BINUTILS_VERSION_2_19_1 is not set # BR2_BINUTILS_VERSION_2_21_1 is not set BR2_BINUTILS_VERSION_2_22=y +# BR2_BINUTILS_VERSION_2_24 is not set BR2_BINUTILS_VERSION="2.22" BR2_EXTRA_BINUTILS_CONFIG_OPTIONS="" @@ -93,6 +97,8 @@ BR2_PACKAGE_GCC=y # BR2_GCC_VERSION_4_3_3 is not set # BR2_GCC_VERSION_4_5_2 is not set BR2_GCC_VERSION_4_6_3=y +# BR2_GCC_VERSION_4_7_3 is not set +# BR2_GCC_VERSION_4_8_2 is not set BR2_GCC_SUPPORTS_SYSROOT=y BR2_GCC_VERSION="4.6.3" # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c index 620df1566..12bf3c047 100644 --- a/misc/buildroot/toolchain/nxflat/ldnxflat.c +++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c @@ -77,6 +77,7 @@ #include <sys/types.h> #include <netinet/in.h> +#include "config.h" #include "bfd.h" #include "arch/arch.h" #include "nxflat.h" diff --git a/misc/buildroot/toolchain/nxflat/mknxflat.c b/misc/buildroot/toolchain/nxflat/mknxflat.c index 3e73d6287..1cb9ef3fe 100644 --- a/misc/buildroot/toolchain/nxflat/mknxflat.c +++ b/misc/buildroot/toolchain/nxflat/mknxflat.c @@ -51,7 +51,9 @@ #include <errno.h> #include <sys/types.h> #include <sys/stat.h> -#include <bfd.h> + +#include "config.h" +#include "bfd.h" #include "nxflat.h" #include "arch/arch.h" |