Attachment #112239 for bug #153612




#

PORTNAME=	binutils
PORTVERSION=	2.17
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR=	binutils/releases

MAINTAINER=	jflemer@alum.rpi.edu
COMMENT=	GNU binutils for vanilla ARM cross-development

LICENSE=	GPLv2

USE_BZIP2=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes

Lines 1-3 Link Here

(-)arm-elf-binutils/distinfo (-3 / +2 lines)
1	MD5 (binutils-2.14.tar.bz2) = 2da8def15d28af3ec6af0982709ae90a	1	SHA256 (binutils-2.17.tar.bz2) = e2c33ce6f23c9a366f109ced295626cb2f8bd6b2f08ff9df6dafb5448505a25e
2	SHA256 (binutils-2.14.tar.bz2) = e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59	2	SIZE (binutils-2.17.tar.bz2) = 13795751
3	SIZE (binutils-2.14.tar.bz2) = 10921504




--- binutils/objcopy.c	2007/06/29 00:34:14	1.115
+++ binutils/objcopy.c	2007/07/02 08:05:06	1.116
@@ -910,8 +910,7 @@
 {
   asymbol **from = isyms, **to = osyms;
   long src_count = 0, dst_count = 0;
-  int relocatable = (abfd->flags & (HAS_RELOC | EXEC_P | DYNAMIC))
-		    == HAS_RELOC;
+  int relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0;
 
   for (; src_count < symcount; src_count++)
     {




RCS file: /cvs/src/src/ld/scripttempl/elf.sc,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ld/scripttempl/elf.sc	2007/06/29 16:29:17	1.81
+++ ld/scripttempl/elf.sc	2007/07/10 04:53:13	1.82
@@ -124,7 +124,7 @@
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
 DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }"
-STACKNOTE="/DISCARD/ : { *(.note.GNU-stack) }"
+DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }"
 if test -z "${NO_SMALL_DATA}"; then
   SBSS=".sbss         ${RELOCATING-0} :
   {
@@ -518,6 +518,6 @@
   ${ATTRS_SECTIONS}
   ${OTHER_SECTIONS}
   ${RELOCATING+${OTHER_SYMBOLS}}
-  ${RELOCATING+${STACKNOTE}}
+  ${RELOCATING+${DISCARDED}}
 }
 EOF




RCS file: /cvs/src/src/ld/ldlang.c,v
retrieving revision 1.218
diff -u -p -r1.218 ldlang.c
--- ld/ldlang.c	17 May 2006 16:46:54 -0000	1.218
+++ ld/ldlang.c	19 May 2006 02:39:55 -0000
@@ -4198,7 +4198,8 @@ lang_size_sections_1
 		    /* If a loadable section is using the default memory
 		       region, and some non default memory regions were
 		       defined, issue an error message.  */
-		    if (!IGNORE_SECTION (os->bfd_section)
+		    if (!os->ignored
+			&& !IGNORE_SECTION (os->bfd_section)
 			&& ! link_info.relocatable
 			&& check_regions
 			&& strcmp (os->region->name,

Lines 19-25 Link Here

(-)arm-elf-binutils/pkg-plist (+2 lines)
19	arm-elf/lib/ldscripts/armelf.xr	19	arm-elf/lib/ldscripts/armelf.xr
20	arm-elf/lib/ldscripts/armelf.xs	20	arm-elf/lib/ldscripts/armelf.xs
21	arm-elf/lib/ldscripts/armelf.xsc	21	arm-elf/lib/ldscripts/armelf.xsc
		22	arm-elf/lib/ldscripts/armelf.xsw
22	arm-elf/lib/ldscripts/armelf.xu	23	arm-elf/lib/ldscripts/armelf.xu
		24	arm-elf/lib/ldscripts/armelf.xw
23	arm-elf/lib/libiberty.a	25	arm-elf/lib/libiberty.a
24	bin/arm-elf-addr2line	26	bin/arm-elf-addr2line
25	bin/arm-elf-ar	27	bin/arm-elf-ar

Return to bug 153612

Lines 7-14 Link Here

(-)arm-elf-binutils/Makefile (-2 / +3 lines)
7	#	7	#
8		8
9	PORTNAME= binutils	9	PORTNAME= binutils
10	PORTVERSION= 2.14	10	PORTVERSION= 2.17
11	PORTREVISION= 2
12	CATEGORIES= devel	11	CATEGORIES= devel
13	MASTER_SITES= ${MASTER_SITE_SOURCEWARE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
14	MASTER_SITE_SUBDIR= binutils/releases	13	MASTER_SITE_SUBDIR= binutils/releases
Lines 17-22 Link Here
17	MAINTAINER= jflemer@alum.rpi.edu	16	MAINTAINER= jflemer@alum.rpi.edu
18	COMMENT= GNU binutils for vanilla ARM cross-development	17	COMMENT= GNU binutils for vanilla ARM cross-development
19		18
		19	LICENSE= GPLv2
		20
20	USE_BZIP2= yes	21	USE_BZIP2= yes
21	USE_GMAKE= yes	22	USE_GMAKE= yes
22	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes

Line 0 Link Here

(-)arm-elf-binutils/files/patch-binutils-objcopy.c (+12 lines)
	1	--- binutils/objcopy.c 2007/06/29 00:34:14 1.115
	2	+++ binutils/objcopy.c 2007/07/02 08:05:06 1.116
	3	@@ -910,8 +910,7 @@
	4	{
	5	asymbol from = isyms, to = osyms;
	6	long src_count = 0, dst_count = 0;
	7	- int relocatable = (abfd->flags & (HAS_RELOC \| EXEC_P \| DYNAMIC))
	8	- == HAS_RELOC;
	9	+ int relocatable = (abfd->flags & (EXEC_P \| DYNAMIC)) == 0;
	10
	11	for (; src_count < symcount; src_count++)
	12	{

Line 0 Link Here

(-)arm-elf-binutils/files/patch-ld-elf.sc (+23 lines)
	1	RCS file: /cvs/src/src/ld/scripttempl/elf.sc,v
	2	retrieving revision 1.81
	3	retrieving revision 1.82
	4	diff -u -r1.81 -r1.82
	5	--- ld/scripttempl/elf.sc 2007/06/29 16:29:17 1.81
	6	+++ ld/scripttempl/elf.sc 2007/07/10 04:53:13 1.82
	7	@@ -124,7 +124,7 @@
	8	DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }"
	9	RODATA=".rodata ${RELOCATING-0} : { (.rodata${RELOCATING+ .rodata. .gnu.linkonce.r.*}) }"
	10	DATARELRO=".data.rel.ro : { (.data.rel.ro.local .gnu.linkonce.d.rel.ro.local.) (.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }"
	11	-STACKNOTE="/DISCARD/ : { *(.note.GNU-stack) }"
	12	+DISCARDED="/DISCARD/ : { (.note.GNU-stack) (.gnu_debuglink) }"
	13	if test -z "${NO_SMALL_DATA}"; then
	14	SBSS=".sbss ${RELOCATING-0} :
	15	{
	16	@@ -518,6 +518,6 @@
	17	${ATTRS_SECTIONS}
	18	${OTHER_SECTIONS}
	19	${RELOCATING+${OTHER_SYMBOLS}}
	20	- ${RELOCATING+${STACKNOTE}}
	21	+ ${RELOCATING+${DISCARDED}}
	22	}
	23	EOF

Line 0 Link Here

(-)arm-elf-binutils/files/patch-ld-ldlang.c (+15 lines)
	1	RCS file: /cvs/src/src/ld/ldlang.c,v
	2	retrieving revision 1.218
	3	diff -u -p -r1.218 ldlang.c
	4	--- ld/ldlang.c 17 May 2006 16:46:54 -0000 1.218
	5	+++ ld/ldlang.c 19 May 2006 02:39:55 -0000
	6	@@ -4198,7 +4198,8 @@ lang_size_sections_1
	7	/* If a loadable section is using the default memory
	8	region, and some non default memory regions were
	9	defined, issue an error message. */
	10	- if (!IGNORE_SECTION (os->bfd_section)
	11	+ if (!os->ignored
	12	+ && !IGNORE_SECTION (os->bfd_section)
	13	&& ! link_info.relocatable
	14	&& check_regions
	15	&& strcmp (os->region->name,