Browse Source

use binutils 2.22 for m68k to fix a issue with testsuite compile

Waldemar Brodkorb 9 years ago
parent
commit
c59a468aae
3 changed files with 21 additions and 11 deletions
  1. 5 1
      target/config/Config.in.toolchain
  2. 10 4
      toolchain/binutils/Makefile.inc
  3. 6 6
      toolchain/uclibc/Makefile.inc

+ 5 - 1
target/config/Config.in.toolchain

@@ -74,7 +74,9 @@ config ADK_TOOLCHAIN_BINUTILS_2_20_1
 config ADK_TOOLCHAIN_BINUTILS_2_22
 	prompt "2.22"
 	boolean
-	depends on ADK_LINUX_BFIN || ADK_LINUX_CRIS
+	depends on ADK_LINUX_BFIN \
+		|| ADK_LINUX_CRIS \
+		|| ADK_LINUX_M68K
 
 config ADK_TOOLCHAIN_BINUTILS_2_23_ARC
 	prompt "2.23-arc"
@@ -88,6 +90,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_24
 	depends on !ADK_LINUX_ARC
 	depends on !ADK_LINUX_AVR32
 	depends on !ADK_LINUX_CRIS
+	depends on !ADK_LINUX_M68K
 
 config ADK_TOOLCHAIN_BINUTILS_GIT
 	prompt "git"
@@ -97,6 +100,7 @@ config ADK_TOOLCHAIN_BINUTILS_GIT
 	depends on !ADK_LINUX_ARC
 	depends on !ADK_LINUX_AVR32
 	depends on !ADK_LINUX_CRIS
+	depends on !ADK_LINUX_M68K
 
 endchoice
 

+ 10 - 4
toolchain/binutils/Makefile.inc

@@ -4,8 +4,8 @@
 PKG_NAME:=		binutils
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y)
 PKG_VERSION:=		2.24
-PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
@@ -13,22 +13,28 @@ ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_23_ARC),y)
 # git commit afcd0783a37c73e09439737a11e0b3183746a652
 # https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/tree/arc-2.23-tls
 PKG_VERSION:=		2.23
-PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_SITES:=		http://www.openadk.org/distfiles/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-arc.tar.xz
 endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_22),y)
 PKG_VERSION:=		2.22
-PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_20_1),y)
 PKG_VERSION:=		2.20.1
-PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y)
+PKG_VERSION:=		git
+PKG_RELEASE:=		1
+PKG_REPO:=		git://sourceware.org/git/binutils-gdb.git
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+endif

+ 6 - 6
toolchain/uclibc/Makefile.inc

@@ -3,13 +3,13 @@
 
 PKG_NAME:=		uClibc
 ifeq ($(ADK_LIBC_VERSION),git)
-PKG_VERSION:=           0.9.34-git
-PKG_REPO:=              git://git.uclibc.org/uClibc.git
+PKG_VERSION:=		0.9.34-git
+PKG_RELEASE:=		1
+PKG_REPO:=		git://git.uclibc.org/uClibc.git
 else
-PKG_VERSION:=           $(ADK_LIBC_VERSION)
-PKG_SITES:=             http://downloads.uclibc-ng.org/
-endif
+PKG_VERSION:=		$(ADK_LIBC_VERSION)
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		73e6fe215648d02246f4d195b25fb17e
 PKG_SITES:=		http://uclibc.org/downloads/
+endif
+PKG_MD5SUM:=		73e6fe215648d02246f4d195b25fb17e
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz