From 51be5a4abcb691101049d0dcb0a4541312d12cf9 Mon Sep 17 00:00:00 2001 From: kristerw Date: Thu, 24 Aug 2006 20:18:04 +0000 Subject: Make this build with cross/binutils 2.17.0.0, and bump PKGREVISION for ABI change in the new binutils. --- 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(-) (limited to 'cross') diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile index 73ba0d12bc9..fad35440b11 100644 --- a/cross/bfd-crunchide/Makefile +++ b/cross/bfd-crunchide/Makefile @@ -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 --git a/cross/bfd-crunchide/files/crunchide.c b/cross/bfd-crunchide/files/crunchide.c index 7e197437929..f6683f1969f 100644 --- a/cross/bfd-crunchide/files/crunchide.c +++ b/cross/bfd-crunchide/files/crunchide.c @@ -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 #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 @@ -406,7 +406,7 @@ copy_section(ibfd, isection, arg) 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 @@ copy_section(ibfd, isection, arg) 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 --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile index 017690b7379..afe2a68428d 100644 --- a/cross/bfd-mdsetimage/Makefile +++ b/cross/bfd-mdsetimage/Makefile @@ -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 --git a/cross/bfd-mdsetimage/files/mdsetimage.c b/cross/bfd-mdsetimage/files/mdsetimage.c index 6e4ac72fc3f..80363e2a1c0 100644 --- a/cross/bfd-mdsetimage/files/mdsetimage.c +++ b/cross/bfd-mdsetimage/files/mdsetimage.c @@ -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 @@ __COPYRIGHT( #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 @@ -243,7 +243,7 @@ find_md_root(abfd, symbols) 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)); -- cgit v1.2.3