[gdb] Make make-init-c more robust

In commit 2711e4754fc ("Ensure cooked_index_entry self-tests are run"), we
rewrite the function definition of _initialize_dwarf2_entry into a normal
form that allows the make-init-c script to detect it:
...
 void _initialize_dwarf2_entry ();
-void _initialize_dwarf2_entry ()
+void
+_initialize_dwarf2_entry ()
...

Update make-init-c to also detect the "void _initialize_dwarf2_entry ()"
variant.

Tested on x86_64-linux, by reverting commit 2711e4754fc, rebuilding and
checking that build/gdb/init.c doesn't change.

diff --git a/gdb/make-init-c b/gdb/make-init-c
index 4f0185c895e87d40ac3530e2031fb6cfb80b9f2a..5ea6df543e83eac76f90e4ba054988ec8c4f5f10 100755 (executable)
--- a/gdb/make-init-c
+++ b/gdb/make-init-c
@@ -43,7 +43,7 @@ echo "/* Do not modify this file.  */"
 echo "/* It is created automatically by the Makefile.  */"
 echo "#include <algorithm>"
 echo ""
-sed -n -e 's/^\(_initialize_[a-zA-Z0-9_]*\) ()$/\1/p' "$@" | while read -r name; do
+sed -n -e 's/^\(void \|\)\(_initialize_[a-zA-Z0-9_]*\) ()$/\2/p' "$@" | while read -r name; do
   echo "extern initialize_file_ftype $name;"
 done
 echo ""
@@ -53,7 +53,7 @@ echo "initialize_all_files ()"
 echo "{"
 echo "  std::vector<initialize_file_ftype *> functions ="
 echo "    {"
-sed -n -e 's/^\(_initialize_[a-zA-Z0-9_]*\) ()$/\1/p' "$@" | while read -r name; do
+sed -n -e 's/^\(void \|\)\(_initialize_[a-zA-Z0-9_]*\) ()$/\2/p' "$@" | while read -r name; do
   echo "      $name,"
 done
 echo "    };"