Browse Source

add small patch to allow compile for crisv10, remove binutils 2.22

Waldemar Brodkorb 7 years ago
parent
commit
a0a0744e60

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

@@ -6,6 +6,7 @@ prompt "Binutils version"
 default ADK_TOOLCHAIN_BINUTILS_2_20_1 if ADK_TARGET_ARCH_AVR32
 default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_BINUTILS_2_26_1 if ADK_TARGET_ARCH_BFIN
+default ADK_TOOLCHAIN_BINUTILS_2_26_1 if ADK_TARGET_ARCH_CRIS
 default ADK_TOOLCHAIN_BINUTILS_2_26_1 if ADK_TARGET_ARCH_H8300
 default ADK_TOOLCHAIN_BINUTILS_2_26_1 if ADK_TARGET_ARCH_M68K && !ADK_TARGET_CPU_CF
 default ADK_TOOLCHAIN_BINUTILS_2_26_1 if ADK_TARGET_ARCH_MOXIE
@@ -24,7 +25,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_26_1
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_NDS32
-	depends on !ADK_TARGET_CPU_CRIS_CRISV10
 
 config ADK_TOOLCHAIN_BINUTILS_2_25_1
 	bool "2.25.1"
@@ -49,10 +49,6 @@ config ADK_TOOLCHAIN_BINUTILS_ARC
 	bool "arc"
 	depends on ADK_TARGET_ARCH_ARC
 
-config ADK_TOOLCHAIN_BINUTILS_2_22
-	bool "2.22"
-	depends on ADK_TARGET_CPU_CRIS_CRISV10
-
 config ADK_TOOLCHAIN_BINUTILS_2_20_1
 	bool "2.20.1"
 	depends on ADK_TARGET_ARCH_AVR32

+ 0 - 7
toolchain/binutils/Makefile.inc

@@ -30,13 +30,6 @@ PKG_RELEASE:=		1
 PKG_SITES:=		https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb.git
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_22),y)
-PKG_VERSION:=		2.22
-PKG_RELEASE:=		1
-PKG_HASH:=		12c26349fc7bb738f84b9826c61e103203187ca2d46f08b82e61e21fcbc6e3e6
-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_RELEASE:=		1

+ 14 - 0
toolchain/binutils/patches/2.26.1/crisv10.patch

@@ -0,0 +1,14 @@
+diff -Nur binutils-2.26.1.orig/bfd/elf32-cris.c binutils-2.26.1/bfd/elf32-cris.c
+--- binutils-2.26.1.orig/bfd/elf32-cris.c	2015-11-13 09:27:40.000000000 +0100
++++ binutils-2.26.1/bfd/elf32-cris.c	2016-07-09 19:19:49.305293884 +0200
+@@ -2728,8 +2728,8 @@
+ 
+   /* A GOTPLT reloc, when activated, is supposed to be included into
+      the PLT refcount.  */
+-  BFD_ASSERT (h->gotplt_refcount == 0
+-	      || h->gotplt_refcount <= h->root.plt.refcount);
++  /* BFD_ASSERT (h->gotplt_refcount == 0
++	      || h->gotplt_refcount <= h->root.plt.refcount); */
+ 
+   /* If nobody wanted a GOTPLT with this symbol, we're done.  */
+   if (h->gotplt_refcount <= 0)

+ 0 - 3
toolchain/elf2flt/Makefile

@@ -9,9 +9,6 @@ include $(ADK_TOPDIR)/mk/buildhlp.mk
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y)
 BINUTILS_VERSION:=	git
 endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_22),y)
-BINUTILS_VERSION:=	2.22
-endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y)
 BINUTILS_VERSION:=	2.24
 endif