Commit 009407e6 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

binutils: make it a proper package 



* Convert binutils to a proper autotargets package

* Add version 2.21 and drop version 2.17

* Hook up packaged binutils for target gcc

* Build tools are on HOST_DIR now so change it

* Move cross/host gcc to HOST_DIR

* Drop kludge from commit 3c77bab2
  This is fixed in the next commit "gcc: install copies of libgcc,
  libstdc++ and libgcj to the sysroot" - tested for arm & x86_64
  targets.

* TARGET_CROSS now pointed to HOST_DIR too

[Peter: Config.in tweaks]
Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent b25cf0a0

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ BASE_TARGETS += host-ccache 
endif



ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

BASE_TARGETS += uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers

BASE_TARGETS += uclibc-configured host-binutils cross_compiler uclibc-target-utils kernel-headers

else

BASE_TARGETS += uclibc

endif
@@ -618,7 +618,7 @@ endif 


configured: dirs kernel-headers uclibc-config busybox-config linux26-config



prepatch:	gcc-patched binutils-patched gdb-patched uclibc-patched

prepatch:	gcc-patched gdb-patched uclibc-patched



cross: $(BASE_TARGETS)

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ endmenu 
menu "Development tools"

source "package/autoconf/Config.in"

source "package/automake/Config.in"

source "package/binutils/Config.in"

source "package/bison/Config.in"

source "package/bsdiff/Config.in"

source "package/ccache/Config.in"

package/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ TARGET_CXXFLAGS=$(TARGET_CFLAGS) 
TARGET_SYSROOT_OPT=--sysroot=$(STAGING_DIR)



ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-

TARGET_CROSS=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-

else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)

TOOLCHAIN_EXTERNAL_PREFIX=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))

ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)

package/binutils/Config.in

0 → 100644
+21 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_BINUTILS

	bool "libbfd (binutils)"

	depends on BR2_TOOLCHAIN_BUILDROOT

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE

	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE

	help

	  Install libbfd from binutils in the target.



	  This is used by oprofile to avoid a full-blown target binutils.



config BR2_PACKAGE_BINUTILS_TARGET

	bool "binutils binaries"

	depends on BR2_PACKAGE_BINUTILS

	help

	  The GNU Binutils are a collection of binary tools:



	  ld - the GNU linker.

	  as - the GNU assembler.

	  and others...



	  http://www.gnu.org/software/binutils/

toolchain/binutils/Config.in→package/binutils/Config.in.host

+7 −10
Original line number Diff line number Diff line 
# Choose binutils version.



comment "Binutils Options"



choice

	prompt "Binutils Version"

	default BR2_BINUTILS_VERSION_2_20_1

	default BR2_BINUTILS_VERSION_2_21

	help

	  Select the version of binutils you wish to use.



	config BR2_BINUTILS_VERSION_2_17

		depends on !BR2_avr32

		depends on BR2_DEPRECATED

		bool "binutils 2.17"



	config BR2_BINUTILS_VERSION_2_18

		depends on !BR2_avr32

		depends on BR2_DEPRECATED
@@ -40,19 +33,23 @@ choice 
		depends on !BR2_avr32

		bool "binutils 2.20.1"



	config BR2_BINUTILS_VERSION_2_21

		depends on !BR2_avr32

		bool "binutils 2.21"



endchoice



config BR2_BINUTILS_VERSION

	string

	default "2.17"		if BR2_BINUTILS_VERSION_2_17

	default "2.18"		if BR2_BINUTILS_VERSION_2_18

	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1

	default "2.19"		if BR2_BINUTILS_VERSION_2_19

	default "2.19.1"	if BR2_BINUTILS_VERSION_2_19_1

	default "2.20"		if BR2_BINUTILS_VERSION_2_20

	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1

	default "2.21"		if BR2_BINUTILS_VERSION_2_21



config BR2_EXTRA_BINUTILS_CONFIG_OPTIONS

config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS

	string "Additional binutils options"

	default ""

	help