diff --git a/ld/ChangeLog b/ld/ChangeLog index f14b82be52..45b8f9ff1c 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2000-01-23 Alan Modra + + * emultempl/{armcoff.em,armelf.em,armelf_oabi.em,beos.em, + generic.em,gld960.em,gld960c.em,hppaelf.em,linux.em,lnk960.em, + mipsecoff.em,sunos.em,vanilla.em} (ld_emulation_xfer_struct): + Add missing NULL initialisers, and comments. + + * testsuite/ld-srec/sr3.cc (__rethrow): New. + 2000-01-21 Nick Clifton * ldlang.c (lang_size_sections): Fix typo in comment. diff --git a/ld/emultempl/armcoff.em b/ld/emultempl/armcoff.em index bdb79d416e..79e1e80e37 100644 --- a/ld/emultempl/armcoff.em +++ b/ld/emultempl/armcoff.em @@ -278,13 +278,14 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld${EMULATION_NAME}_get_script, "${EMULATION_NAME}", "${OUTPUT_FORMAT}", - gld${EMULATION_NAME}_finish, /* finish */ - NULL, /* create output section statements */ - NULL, /* open dynamic archive */ - NULL, /* place orphan */ - NULL, /* set_symbols */ + gld${EMULATION_NAME}_finish, + NULL, /* create output section statements */ + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ gld${EMULATION_NAME}_parse_args, - NULL, /* unrecognised file */ - gld${EMULATION_NAME}_list_options + NULL, /* unrecognised file */ + gld${EMULATION_NAME}_list_options, + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index c3a1b3ca32..345b12ce50 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -1278,14 +1278,14 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld${EMULATION_NAME}_get_script, "${EMULATION_NAME}", "${OUTPUT_FORMAT}", - gld${EMULATION_NAME}_finish, /* finish */ - NULL, /* create output section statements */ + gld${EMULATION_NAME}_finish, + NULL, /* create output section statements */ gld${EMULATION_NAME}_open_dynamic_archive, gld${EMULATION_NAME}_place_orphan, - NULL, /* set_symbols */ + NULL, /* set symbols */ gld${EMULATION_NAME}_parse_args, - NULL, /* unrecognised file */ + NULL, /* unrecognized file */ gld${EMULATION_NAME}_list_options, - NULL /* recognized file */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/armelf_oabi.em b/ld/emultempl/armelf_oabi.em index 3a2dfe472d..aca71f71df 100644 --- a/ld/emultempl/armelf_oabi.em +++ b/ld/emultempl/armelf_oabi.em @@ -163,13 +163,14 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld${EMULATION_NAME}_get_script, "${EMULATION_NAME}", "${OUTPUT_FORMAT}", - NULL, /* finish */ - NULL, /* create output section statements */ - NULL, /* open dynamic archive */ - NULL, /* place orphan */ - NULL, /* set_symbols */ - NULL, - NULL, /* unrecognised file */ - NULL + NULL, /* finish */ + NULL, /* create output section statements */ + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em index 39490ca22c..8bbdc0af28 100644 --- a/ld/emultempl/beos.em +++ b/ld/emultempl/beos.em @@ -832,6 +832,9 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = NULL, /* open dynamic archive */ gld${EMULATION_NAME}_place_orphan, gld_${EMULATION_NAME}_set_symbols, - gld_${EMULATION_NAME}_parse_args + gld_${EMULATION_NAME}_parse_args, + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/generic.em b/ld/emultempl/generic.em index 9a3f530782..813238d9c0 100644 --- a/ld/emultempl/generic.em +++ b/ld/emultempl/generic.em @@ -113,6 +113,15 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = before_allocation_default, gld${EMULATION_NAME}_get_script, "${EMULATION_NAME}", - "${OUTPUT_FORMAT}" + "${OUTPUT_FORMAT}", + NULL, /* finish */ + NULL, /* create output section statements */ + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/gld960.em b/ld/emultempl/gld960.em index 63b4af0973..62eddb1ec6 100644 --- a/ld/emultempl/gld960.em +++ b/ld/emultempl/gld960.em @@ -168,6 +168,15 @@ struct ld_emulation_xfer_struct ld_gld960_emulation = before_allocation_default, gld960_get_script, "960", - "" + "", + NULL, /* finish */ + NULL, /* create output section statements */ + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/gld960c.em b/ld/emultempl/gld960c.em index 4789b22e5b..fe8d0b0e3f 100644 --- a/ld/emultempl/gld960c.em +++ b/ld/emultempl/gld960c.em @@ -184,6 +184,15 @@ struct ld_emulation_xfer_struct ld_gld960coff_emulation = before_allocation_default, gld960_get_script, "960coff", - "" + "", + NULL, /* finish */ + NULL, /* create output section statements */ + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em index 69abe3ba2e..dd3b264a44 100644 --- a/ld/emultempl/hppaelf.em +++ b/ld/emultempl/hppaelf.em @@ -276,5 +276,12 @@ struct ld_emulation_xfer_struct ld_hppaelf_emulation = "elf32-hppa", hppaelf_finish, hppaelf_create_output_section_statements, + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/linux.em b/ld/emultempl/linux.em index b8a03ff607..548eb808cc 100644 --- a/ld/emultempl/linux.em +++ b/ld/emultempl/linux.em @@ -198,14 +198,14 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld${EMULATION_NAME}_get_script, "${EMULATION_NAME}", "${OUTPUT_FORMAT}", - NULL, + NULL, /* finish */ gld${EMULATION_NAME}_create_output_section_statements, gld${EMULATION_NAME}_open_dynamic_archive, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em index 9df2f609af..9ab6b3f053 100644 --- a/ld/emultempl/lnk960.em +++ b/ld/emultempl/lnk960.em @@ -320,6 +320,15 @@ struct ld_emulation_xfer_struct ld_lnk960_emulation = lnk960_before_allocation, lnk960_get_script, "lnk960", - "" + "", + NULL, /* finish */ + NULL, /* create output section statements */ + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/mipsecoff.em b/ld/emultempl/mipsecoff.em index 10d5924691..b47a9daefc 100644 --- a/ld/emultempl/mipsecoff.em +++ b/ld/emultempl/mipsecoff.em @@ -224,6 +224,15 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = before_allocation_default, gld${EMULATION_NAME}_get_script, "${EMULATION_NAME}", - "${OUTPUT_FORMAT}" + "${OUTPUT_FORMAT}", + NULL, /* finish */ + NULL, /* create output section statements */ + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/sunos.em b/ld/emultempl/sunos.em index 8f095fef3e..fa71ab0edb 100644 --- a/ld/emultempl/sunos.em +++ b/ld/emultempl/sunos.em @@ -1029,10 +1029,14 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = gld${EMULATION_NAME}_get_script, "${EMULATION_NAME}", "${OUTPUT_FORMAT}", - NULL, /* finish */ + NULL, /* finish */ gld${EMULATION_NAME}_create_output_section_statements, - NULL, /* open_dynamic_library */ - NULL, /* place_orphan */ - gld${EMULATION_NAME}_set_symbols + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + gld${EMULATION_NAME}_set_symbols, + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/emultempl/vanilla.em b/ld/emultempl/vanilla.em index 04e36fbc94..d9076ca195 100644 --- a/ld/emultempl/vanilla.em +++ b/ld/emultempl/vanilla.em @@ -64,6 +64,15 @@ struct ld_emulation_xfer_struct ld_vanilla_emulation = before_allocation_default, vanilla_get_script, "vanilla", - "a.out-sunos-big" + "a.out-sunos-big", + NULL, /* finish */ + NULL, /* create output section statements */ + NULL, /* open dynamic archive */ + NULL, /* place orphan */ + NULL, /* set symbols */ + NULL, /* parse args */ + NULL, /* unrecognized file */ + NULL, /* list options */ + NULL /* recognized file */ }; EOF diff --git a/ld/testsuite/ld-srec/sr3.cc b/ld/testsuite/ld-srec/sr3.cc index bfe5cc849b..4cde2dcbeb 100644 --- a/ld/testsuite/ld-srec/sr3.cc +++ b/ld/testsuite/ld-srec/sr3.cc @@ -55,6 +55,11 @@ __throw () { } +void +__rethrow () +{ +} + void __terminate () {