summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorwiz <wiz>2004-09-09 01:33:10 +0000
committerwiz <wiz>2004-09-09 01:33:10 +0000
commitc56e6e4e3ce3b38ace473c48e935958918a04bd1 (patch)
tree5e3090658a7c2977cee401db1d7ba96859f12907 /cross
parent1dd40527e56213b5200d080d4fa3f8198e2517f4 (diff)
downloadpkgsrc-c56e6e4e3ce3b38ace473c48e935958918a04bd1.tar.gz
Make this build with the version of binutils currently in cross-binutils.
No idea if this works, since I don't know how to use this, but the diff looks sane enough to me.
Diffstat (limited to 'cross')
-rw-r--r--cross/bfd-mdsetimage/Makefile4
-rw-r--r--cross/bfd-mdsetimage/files/mdsetimage.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index 8ca87e38cc3..b7ee8b7d160 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/08/27 06:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/09/09 01:33:10 wiz Exp $
DISTNAME= bfd-mdsetimage-1.15.1
CATEGORIES= cross
@@ -22,7 +22,7 @@ MAKE_ENV+= BFD_VERSION=${BFD_VERSION} \
LIBS="${BFD_LIBS}"
FIX_RPATH+= BFD_LIBS
-BFD_LIBS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty
+BFD_LIBS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd -liberty -lintl
do-extract:
@${MKDIR} ${WRKSRC}
diff --git a/cross/bfd-mdsetimage/files/mdsetimage.c b/cross/bfd-mdsetimage/files/mdsetimage.c
index a45bc3426de..6e4ac72fc3f 100644
--- a/cross/bfd-mdsetimage/files/mdsetimage.c
+++ b/cross/bfd-mdsetimage/files/mdsetimage.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mdsetimage.c,v 1.3 2001/10/01 23:39:25 cgd Exp $ */
+/* $NetBSD: mdsetimage.c,v 1.4 2004/09/09 01:33:10 wiz 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.3 2001/10/01 23:39:25 cgd Exp $");
+__RCSID("$NetBSD: mdsetimage.c,v 1.4 2004/09/09 01:33:10 wiz Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -59,9 +59,9 @@ struct symbols {
size_t offset;
} md_root_symbols[] = {
#define X_MD_ROOT_IMAGE 0
- { "_md_root_image", NULL, 0 },
+ { "_md_root_image", 0, 0 },
#define X_MD_ROOT_SIZE 1
- { "_md_root_size", NULL, 0 },
+ { "_md_root_size", 0, 0 },
{ NULL }
};
@@ -206,7 +206,7 @@ find_md_root(abfd, symbols)
long number_of_symbols;
asymbol **symbol_table = NULL;
struct symbols *s;
- struct sec *p;
+ struct bfd_section *p;
storage_needed = bfd_get_symtab_upper_bound(abfd);
if (storage_needed <= 0)
@@ -239,7 +239,7 @@ find_md_root(abfd, symbols)
free(symbol_table);
for (s = symbols; s->name != NULL; s++) {
- if (s->vma == NULL)
+ if (s->vma == 0)
return (1);
for (p = abfd->sections; p != NULL; p = p->next) {