binutils: remove dead code

When binutils for the host is not built (which is the case when an external toolchain is used), the version of binutils used is 2.21, which is quite old. Since we have bumped to 2.22 as the default version for the host binutils, let's do the same for the target binutils.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/binutils/binutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/binutils/binutils.mk +1 -1

index ab9f167..b8dab5d 100644
@@ -12,7 +12,7 @@ ifeq ($(BR2_avr32),y)
 # avr32 uses a special version
 BINUTILS_VERSION = 2.18-avr32-1.0.1
 else
-BINUTILS_VERSION = 2.21
+BINUTILS_VERSION = 2.22
 endif
 endif
 

From: Alexey Brodkin <[email protected]>

binutils starting at least from 2.23 when build for target require uClibc configured with UCLIBC_HAS_WCHAR otherwise:

libtool: link: [...] -o as-new [...]
read.o: In function `read_symbol_name':
read.c:(.text+0x3634): undefined reference to `mbstowcs'
collect2: error: ld returned 1 exit status

because "mbstowcs" is not available in the C library.

Even though we're not yet using 2.23.2 as the default version, we will probably do it in the near future, so this commit doesn't bother with making the wchar dependency version-specific, and applies it to the binutils package as a whole.

Fixes bug #6218

[Thomas:
- more details in the commit log.
- add comment about the wchar dependency
- propagate the dependency to dropwatch (and fix a mistake in the architecture dependencies of the comment)
- propagate the dependency to oprofile.]

Signed-off-by Alexey Brodkin <[email protected]>

Cc Anton Kolesov <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/binutils/Config.in  | 5 +++++
 package/dropwatch/Config.in | 7 ++++---
 package/oprofile/Config.in  | 5 +++--
 3 files changed, 12 insertions(+), 5 deletions(-)

package/binutils/Config.in +5 -0

index 44e7ae0..50c38b6 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_BINUTILS
 	bool "binutils"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	depends on !BR2_aarch64 && !BR2_nios2
+	depends on BR2_USE_WCHAR
 	help
 	  Install binutils on the target
 

@@ -19,3 +20,7 @@ config BR2_PACKAGE_BINUTILS_TARGET
 	  http://www.gnu.org/software/binutils/
 
 endif
+
+comment "binutils needs a toolchain w/ wchar"
+	depends on !BR2_aarch64 && !BR2_nios2
+	depends on BR2_USE_WCHAR

package/dropwatch/Config.in +4 -3

index 0c9aca6..d331e5e 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DROPWATCH
 	bool "dropwatch"
 	select BR2_PACKAGE_BINUTILS
 	depends on !BR2_aarch64 && !BR2_nios2 # binutils
+	depends on BR2_USE_WCHAR # binutils
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_LIBNL
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl

@@ -11,6 +12,6 @@ config BR2_PACKAGE_DROPWATCH
 
 	  https://fedorahosted.org/dropwatch/
 
-comment "dropwatch needs a toolchain w/ threads"
-	depends on !BR2_aarch64
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "dropwatch needs a toolchain w/ threads, wchar"
+	depends on !BR2_aarch64 && !BR2_nios2
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR

package/oprofile/Config.in +3 -2

index 075e9ea..3ea07d9 100644
@@ -6,6 +6,7 @@ config BR2_PACKAGE_OPROFILE
 	select BR2_PACKAGE_LIBPFM4 if BR2_powerpc
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_aarch64 && !BR2_nios2 # binutils
+	depends on BR2_USE_WCHAR # binutils
 	depends on !BR2_xtensa
 	# libpfm4 is needed on PowerPC, and requires thread support
 	depends on BR2_TOOLCHAIN_HAS_THREADS || !BR2_powerpc

@@ -25,10 +26,10 @@ config BR2_PACKAGE_OPROFILE
 	  interrupt handlers, kernel modules, the kernel, shared
 	  libraries, and applications.
 
-comment "oprofile needs a toolchain w/ C++"
+comment "oprofile needs a toolchain w/ C++, wchar"
 	depends on BR2_USE_MMU
 	depends on !BR2_aarch64 && !BR2_nios2 && !BR2_xtensa
-	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
 comment "oprofile needs a toolchain w/ threads on PPC"
 	depends on BR2_USE_MMU && BR2_powerpc

We no longer have any way of using version 2.23, and all the other versions that we support are available as .tar.bz2. Therefore we can remove the special case related to the 2.23 version only being available as a .tar.gz archive.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/binutils/binutils.mk | 4 ----
 1 file changed, 4 deletions(-)

package/binutils/binutils.mk +0 -4

index f40c45f..ab9f167 100644
@@ -16,10 +16,6 @@ BINUTILS_VERSION = 2.21
 endif
 endif
 
-ifeq ($(BINUTILS_VERSION),2.23)
-BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
-endif
-
 ifeq ($(ARCH),avr32)
 BINUTILS_SITE = ftp://www.at91.com/pub/buildroot
 endif

We no longer have any way of using version 2.23, and all the other versions that we support are available as .tar.bz2. Therefore we can remove the special case related to the 2.23 version only being available as a .tar.gz archive.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/binutils/binutils.mk | 4 ----
 1 file changed, 4 deletions(-)

package/binutils/binutils.mk +0 -4

index f40c45f..ab9f167 100644
@@ -16,10 +16,6 @@ BINUTILS_VERSION = 2.21
 endif
 endif
 
-ifeq ($(BINUTILS_VERSION),2.23)
-BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
-endif
-
 ifeq ($(ARCH),avr32)
 BINUTILS_SITE = ftp://www.at91.com/pub/buildroot
 endif

Signature · 6 lines

2.0.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot