Commit bdac3e33 authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Update broken AVR32 toolchain, and update configs for this, deprecate all but... 

Update broken AVR32 toolchain, and update configs for this, deprecate all but latest AVR32 toolchain
parent 2326230e

target/device/Atmel/atngw100/atngw100_defconfig

+10 −7
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Sat Jan 10 02:15:06 2009

# Fri Jan 16 23:00:00 2009

#

BR2_HAVE_DOT_CONFIG=y

BR2_VERSION="0.10.0-svn"

BR2_VERSION="2009.02-svn"

# BR2_alpha is not set

# BR2_arm is not set

# BR2_armeb is not set
@@ -16,7 +16,6 @@ BR2_avr32=y 
# BR2_mipsel is not set

# BR2_nios2 is not set

# BR2_powerpc is not set

# BR2_s390 is not set

# BR2_sh is not set

# BR2_sh64 is not set

# BR2_sparc is not set
@@ -85,7 +84,6 @@ BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)" 
#

# Build options

#

BR2_PRIMARY_SITE=""

BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10"

BR2_SVN_CO="svn co"

BR2_SVN_UP="svn up"
@@ -98,6 +96,8 @@ BR2_DL_DIR="$(BASE_DIR)/dl" 
#

# Mirrors and Download locations

#

BR2_PRIMARY_SITE=""

BR2_BACKUP_SITE="http://buildroot.uclibc.org/downloads/sources/"

BR2_SOURCEFORGE_MIRROR="easynews"

BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"

BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
@@ -165,7 +165,7 @@ BR2_EXT_GCC_VERSION_4_2_2=y 
# BR2_EXT_BINUTILS_VERSION_2_17 is not set

BR2_EXT_BINUTILS_VERSION_2_18=y

# BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set

BR2_EXT_UCLIBC_VERSION_0_9_29=y

# BR2_EXT_UCLIBC_VERSION_0_9_29 is not set

BR2_EXT_UCLIBC_VERSION_0_9_30=y



#
@@ -186,7 +186,7 @@ BR2_EXT_UCLIBC_VERSION_0_9_30=y 
BR2_KERNEL_HEADERS_2_6_27=y

# BR2_KERNEL_HEADERS_2_6_28 is not set

# BR2_KERNEL_HEADERS_SNAP is not set

BR2_DEFAULT_KERNEL_HEADERS="2.6.27.10"

BR2_DEFAULT_KERNEL_HEADERS="2.6.27.11"



#

# uClibc Options
@@ -352,6 +352,7 @@ BR2_PACKAGE_LIBDAEMON=y 
# BR2_PACKAGE_LIBGCRYPT is not set

# BR2_PACKAGE_LIBGPG_ERROR is not set

BR2_PACKAGE_LIBICONV=y

# BR2_PACKAGE_LIBIDN is not set

# BR2_PACKAGE_LIBLOCKFILE is not set

# BR2_PACKAGE_LIBOIL is not set

# BR2_PACKAGE_LIBSYSFS is not set
@@ -398,7 +399,6 @@ BR2_PACKAGE_HASERL=y 
BR2_PACKAGE_HASERL_VERSION_0_9_X=y

BR2_PACKAGE_HASERL_VERSION="0.9.25"

# BR2_PACKAGE_IFPLUGD is not set

# BR2_PACKAGE_IRDA_UTILS is not set

# BR2_PACKAGE_IPERF is not set

# BR2_PACKAGE_IPROUTE2 is not set
@@ -411,6 +411,7 @@ BR2_PACKAGE_IPTABLES=y 
# BR2_PACKAGE_LIBCGI is not set

# BR2_PACKAGE_LIBCGICC is not set

# BR2_PACKAGE_LIBCURL is not set

# BR2_PACKAGE_LIBDNET is not set

# BR2_PACKAGE_LIBEXOSIP2 is not set

# BR2_PACKAGE_LIBOSIP2 is not set

# BR2_PACKAGE_LIBPCAP is not set
@@ -602,6 +603,7 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y 
# BR2_PACKAGE_LIBART is not set

# BR2_PACKAGE_LIBPNG is not set

# BR2_PACKAGE_LIBUNGIF is not set

BR2_PACKAGE_LINUX_FUSION=y

# BR2_PACKAGE_PIXMAN is not set

# BR2_PACKAGE_SDL is not set

# BR2_PACKAGE_TIFF is not set
@@ -728,6 +730,7 @@ BR2_PACKAGE_ZLIB=y 
BR2_TARGET_ROOTFS_JFFS2=y

# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set

# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set

# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K is not set

BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y

# BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set

# BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set

target/device/Atmel/atstk100x/atstk100x_defconfig

+185 −123

File changed.

Preview size limit exceeded, changes collapsed.

target/device/Config.in.toolchain

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2 
config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1

	bool "Use prepatched source for AVR32 gcc-4.2.1 toolchain"

	depends on BR2_avr32

	depends on BR2_DEPRECATED

	select BR2_EXT_GCC_VERSION_4_2_1

	select BR2_EXT_BINUTILS_VERSION_2_17

	select BR2_EXT_UCLIBC_VERSION_0_9_29
@@ -37,6 +38,7 @@ config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 
config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2

	bool "Use prepatched source for AVR32 gcc-4.2.2 toolchain"

	depends on BR2_avr32

	depends on BR2_DEPRECATED

	select BR2_EXT_GCC_VERSION_4_2_2

	select BR2_EXT_BINUTILS_VERSION_2_17

	select BR2_EXT_UCLIBC_VERSION_0_9_29
@@ -56,7 +58,6 @@ config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2 
	depends on BR2_avr32

	select BR2_EXT_GCC_VERSION_4_2_2

	select BR2_EXT_BINUTILS_VERSION_2_18

	select BR2_EXT_UCLIBC_VERSION_0_9_29

	select BR2_EXT_UCLIBC_VERSION_0_9_30

	select BR2_TOOLCHAIN_ATMEL_AVR32

	select BR2_GCC_SUPPORTS_SYSROOT
@@ -72,6 +73,7 @@ config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2 
config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3

	bool "Use prepatched source for AVR32 gcc-4.2.3 toolchain"

	depends on BR2_avr32

	depends on BR2_DEPRECATED

	depends on BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3_ENABLE

	select BR2_EXT_GCC_VERSION_4_2_3

	select BR2_EXT_BINUTILS_VERSION_2_17

toolchain/gcc/Config.in

+1 −2
Original line number Diff line number Diff line
@@ -32,9 +32,8 @@ choice 
		bool "gcc 4.2.1"



	config BR2_GCC_VERSION_4_2_2

		depends on BR2_avr32

		depends on BR2_EXT_GCC_VERSION_4_2_2

		depends on BR2_DEPRECATED

		depends on BR2_DEPRECATED || BR2_avr32

		bool "gcc 4.2.2"



	config BR2_GCC_VERSION_4_2_3

toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-1.1.3/901-avr32-revert-broken-uclibc-stuff.patch

0 → 100644
+42 −0
Original line number Diff line number Diff line 
--- a/libstdc++-v3/acinclude.m4

+++ b/libstdc++-v3/acinclude.m4

@@ -125,6 +125,15 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [

   ## other macros from doing the same.  This should be automated.)  -pme

   need_libmath=no

 

+  # Check for uClibc since Linux platforms use different configuration

+  # directories depending on the C library in use.

+  AC_EGREP_CPP([_using_uclibc], [

+  #include <stdio.h>

+  #if __UCLIBC__

+    _using_uclibc

+  #endif

+  ], uclibc=yes, uclibc=no)

+

   # Find platform-specific directories containing configuration info.

   # Also possibly modify flags used elsewhere, as needed by the platform.

   GLIBCXX_CHECK_HOST

--- a/libstdc++-v3/config/os/gnu-linux/ctype_base.h

+++ b/libstdc++-v3/config/os/gnu-linux/ctype_base.h

@@ -31,8 +31,6 @@

 //

 // ISO C++ 14882: 22.1  Locales

 //

-#include <features.h>

-#include <ctype.h>

   

 /** @file ctype_base.h

  *  This is an internal header file, included by other library headers.

@@ -47,11 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)

   struct ctype_base

   {

     // Non-standard typedefs.

-#ifdef __UCLIBC__

-    typedef const __ctype_touplow_t*   __to_type;

-#else

-    typedef const int*         __to_type;

-#endif

+    typedef const int*		__to_type;

  

     // NB: Offsets into ctype<char>::_M_table force a particular size

     // on the mask type. Because of this, we don't use an enum.