diff options
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/Makefile.am | 3 | ||||
| -rw-r--r-- | ld/Makefile.in | 3 | ||||
| -rw-r--r-- | ld/emultempl/netbsd.em | 3 | ||||
| -rw-r--r-- | ld/ldlang.c | 2 | ||||
| -rw-r--r-- | ld/ldlang.h | 2 |
6 files changed, 17 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 11798ff..31f45c0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2003-12-04 Alan Modra <amodra@bigpond.net.au> + + * ldlang.c (lang_do_assignments): Function return is void. + * ldlang.h (lang_do_assignments): Ditto. + * emultempl/netbsd.em (gld${EMULATION_NAME}_before_parse): Declare. + * Makefile.am (ens32knbsd.c): Depend on netbsd.em. + * Makefile.in: Regenerate. + 2003-12-03 Dave Airlie <airlied@linux.ie> * configure.tgt: Add vax-linux-gnu target. diff --git a/ld/Makefile.am b/ld/Makefile.am index 8698879..bff548f 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -1231,7 +1231,8 @@ enews.c: $(srcdir)/emulparams/news.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} news "$(tdir_news)" ens32knbsd.c: $(srcdir)/emulparams/ns32knbsd.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} + $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/netbsd.em \ + $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} ns32knbsd "$(tdir_ns32knbsd)" eor32.c: $(srcdir)/emulparams/or32.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/or32.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 2f1757f..0ee5342 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -1957,7 +1957,8 @@ enews.c: $(srcdir)/emulparams/news.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} news "$(tdir_news)" ens32knbsd.c: $(srcdir)/emulparams/ns32knbsd.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} + $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/netbsd.em \ + $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} ns32knbsd "$(tdir_ns32knbsd)" eor32.c: $(srcdir)/emulparams/or32.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/or32.sc ${GEN_DEPENDS} diff --git a/ld/emultempl/netbsd.em b/ld/emultempl/netbsd.em index b252515..43715e4 100644 --- a/ld/emultempl/netbsd.em +++ b/ld/emultempl/netbsd.em @@ -2,6 +2,9 @@ LDEMUL_BEFORE_PARSE=gldnetbsd_before_parse cat >>e${EMULATION_NAME}.c <<EOF static void +gld${EMULATION_NAME}_before_parse (void); + +static void gldnetbsd_before_parse (void) { gld${EMULATION_NAME}_before_parse (); diff --git a/ld/ldlang.c b/ld/ldlang.c index b7a11f8..3353f98 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -3445,7 +3445,7 @@ lang_do_assignments_1 return dot; } -bfd_vma +void lang_do_assignments (lang_statement_union_type *s, lang_output_section_statement_type *output_section_statement, diff --git a/ld/ldlang.h b/ld/ldlang.h index 391ae9b..29424bb 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -447,7 +447,7 @@ extern void lang_for_each_file (void (*dothis) (lang_input_statement_type *)); extern void lang_reset_memory_regions (void); -extern bfd_vma lang_do_assignments +extern void lang_do_assignments (lang_statement_union_type *, lang_output_section_statement_type *, fill_type *, bfd_vma); |