[pkgsrc/trunk]: pkgsrc/cross Make this build with cross/binutils 2.17.0.0, an...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfe490b7fae2
branches:  trunk
changeset: 517908:bfe490b7fae2
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Thu Aug 24 20:18:04 2006 +0000

description:
Make this build with cross/binutils 2.17.0.0, and bump PKGREVISION for
ABI change in the new binutils.

diffstat:

 cross/bfd-crunchide/Makefile            |  4 ++--
 cross/bfd-crunchide/files/crunchide.c   |  8 ++++----
 cross/bfd-mdsetimage/Makefile           |  3 ++-
 cross/bfd-mdsetimage/files/mdsetimage.c |  6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r e233f74ad0fd -r bfe490b7fae2 cross/bfd-crunchide/Makefile
--- a/cross/bfd-crunchide/Makefile      Thu Aug 24 20:01:23 2006 +0000
+++ b/cross/bfd-crunchide/Makefile      Thu Aug 24 20:18:04 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:56 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/08/24 20:23:27 kristerw Exp $
 
 DISTNAME=      bfd-crunchide-1.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    cross
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r e233f74ad0fd -r bfe490b7fae2 cross/bfd-crunchide/files/crunchide.c
--- a/cross/bfd-crunchide/files/crunchide.c     Thu Aug 24 20:01:23 2006 +0000
+++ b/cross/bfd-crunchide/files/crunchide.c     Thu Aug 24 20:18:04 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: crunchide.c,v 1.3 2004/08/02 02:02:30 kristerw Exp $ */
+/* $NetBSD: crunchide.c,v 1.4 2006/08/24 20:23:28 kristerw Exp $ */
 /* NetBSD: crunchide.c,v 1.9 1999/01/11 22:40:00 kleink Exp     */
 
 /*
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: crunchide.c,v 1.3 2004/08/02 02:02:30 kristerw Exp $");
+__RCSID("$NetBSD: crunchide.c,v 1.4 2006/08/24 20:23:28 kristerw Exp $");
 #endif
 
 #include <unistd.h>
@@ -406,7 +406,7 @@
        long relcount, relsize;
 
        osection = isection->output_section;
-       size = bfd_get_section_size_before_reloc(isection);
+       size = isection->rawsize;
        if (size == 0 || osection == 0)
                return;
 
@@ -424,7 +424,7 @@
                bfd_set_reloc(obfd, osection, relpp, relcount);
        }
 
-       isection->_cooked_size = isection->_raw_size;
+       isection->size = isection->rawsize;
        isection->reloc_done = 1;
 
        if (bfd_get_section_flags(ibfd, isection) & SEC_HAS_CONTENTS) {
diff -r e233f74ad0fd -r bfe490b7fae2 cross/bfd-mdsetimage/Makefile
--- a/cross/bfd-mdsetimage/Makefile     Thu Aug 24 20:01:23 2006 +0000
+++ b/cross/bfd-mdsetimage/Makefile     Thu Aug 24 20:18:04 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:56 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/08/24 20:18:04 kristerw Exp $
 
 DISTNAME=      bfd-mdsetimage-1.15.1
+PKGREVISION=   1
 CATEGORIES=    cross
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r e233f74ad0fd -r bfe490b7fae2 cross/bfd-mdsetimage/files/mdsetimage.c
--- a/cross/bfd-mdsetimage/files/mdsetimage.c   Thu Aug 24 20:01:23 2006 +0000
+++ b/cross/bfd-mdsetimage/files/mdsetimage.c   Thu Aug 24 20:18:04 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mdsetimage.c,v 1.4 2004/09/09 01:33:10 wiz Exp $ */
+/* $NetBSD: mdsetimage.c,v 1.5 2006/08/24 20:18:04 kristerw Exp $ */
 /* from: NetBSD: mdsetimage.c,v 1.15 2001/03/21 23:46:48 cgd Exp $ */
 
 /*
@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: mdsetimage.c,v 1.4 2004/09/09 01:33:10 wiz Exp $");
+__RCSID("$NetBSD: mdsetimage.c,v 1.5 2006/08/24 20:18:04 kristerw Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -243,7 +243,7 @@
                        return (1);
 
                for (p = abfd->sections; p != NULL; p = p->next) {
-                       if (p->vma > s->vma || p->vma + p->_raw_size < s->vma)
+                       if (p->vma > s->vma || p->vma + p->rawsize < s->vma)
                                continue;
 
                        s->offset = (size_t)(p->filepos + (s->vma - p->vma));