From df1f7747e137626a1a4a281aaf636434064d415e Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Fri, 2 Apr 2004 13:36:24 +0000
Subject: [PATCH] #endif /* MUST NOT HAVE TOKENS AFTER IT */

---
 gnu/dist/gdb/sim/ppc/emul_netbsd.c | 2 +-
 gnu/dist/gdb/sim/ppc/hw_htab.c     | 2 ++
 gnu/dist/gdb/sim/ppc/hw_init.c     | 2 +-
 gnu/dist/gdb/sim/ppc/hw_register.c | 2 +-
 gnu/dist/gdb/sim/ppc/hw_trace.c    | 2 +-
 gnu/dist/gdb/sim/ppc/hw_vm.c       | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/dist/gdb/sim/ppc/emul_netbsd.c b/gnu/dist/gdb/sim/ppc/emul_netbsd.c
index 13897face2df..13d8e2590173 100644
--- a/gnu/dist/gdb/sim/ppc/emul_netbsd.c
+++ b/gnu/dist/gdb/sim/ppc/emul_netbsd.c
@@ -1466,4 +1466,4 @@ const os_emul emul_netbsd = {
   0 /*data*/
 };
 
-#endif _EMUL_NETBSD_C_
+#endif /* _EMUL_NETBSD_C_ */
diff --git a/gnu/dist/gdb/sim/ppc/hw_htab.c b/gnu/dist/gdb/sim/ppc/hw_htab.c
index 50a7b6adfcc1..4f006b11e92e 100644
--- a/gnu/dist/gdb/sim/ppc/hw_htab.c
+++ b/gnu/dist/gdb/sim/ppc/hw_htab.c
@@ -386,7 +386,9 @@ htab_sum_binary(bfd *abfd,
   htab_binary_sizes *sizes = (htab_binary_sizes*)data;
   unsigned_word size = bfd_get_section_size_before_reloc (sec);
   unsigned_word vma = bfd_get_section_vma (abfd, sec);
+#ifndef bfd_get_section_lma
 #define bfd_get_section_lma(abfd, sec) ((sec)->lma + 0)
+#endif
   unsigned_word ra = bfd_get_section_lma (abfd, sec);
 
   /* skip the section if no memory to allocate */
diff --git a/gnu/dist/gdb/sim/ppc/hw_init.c b/gnu/dist/gdb/sim/ppc/hw_init.c
index 86e753c608ae..4a8c0ca82fb5 100644
--- a/gnu/dist/gdb/sim/ppc/hw_init.c
+++ b/gnu/dist/gdb/sim/ppc/hw_init.c
@@ -718,4 +718,4 @@ const device_descriptor hw_init_device_descriptor[] = {
   { NULL },
 };
 
-#endif _HW_INIT_C_
+#endif /* _HW_INIT_C_ */
diff --git a/gnu/dist/gdb/sim/ppc/hw_register.c b/gnu/dist/gdb/sim/ppc/hw_register.c
index f361e4625277..27080e138466 100644
--- a/gnu/dist/gdb/sim/ppc/hw_register.c
+++ b/gnu/dist/gdb/sim/ppc/hw_register.c
@@ -128,4 +128,4 @@ const device_descriptor hw_register_device_descriptor[] = {
   { NULL },
 };
 
-#endif _HW_REGISTER_C_
+#endif /* _HW_REGISTER_C_ */
diff --git a/gnu/dist/gdb/sim/ppc/hw_trace.c b/gnu/dist/gdb/sim/ppc/hw_trace.c
index a46483a5191a..38a7fdf823b0 100644
--- a/gnu/dist/gdb/sim/ppc/hw_trace.c
+++ b/gnu/dist/gdb/sim/ppc/hw_trace.c
@@ -100,4 +100,4 @@ const device_descriptor hw_trace_device_descriptor[] = {
   { NULL },
 };
 
-#endif _HW_TRACE_C_
+#endif /* _HW_TRACE_C_ */
diff --git a/gnu/dist/gdb/sim/ppc/hw_vm.c b/gnu/dist/gdb/sim/ppc/hw_vm.c
index e42b8002347d..10987e09c5a5 100644
--- a/gnu/dist/gdb/sim/ppc/hw_vm.c
+++ b/gnu/dist/gdb/sim/ppc/hw_vm.c
@@ -272,4 +272,4 @@ const device_descriptor hw_vm_device_descriptor[] = {
   { NULL },
 };
 
-#endif _HW_VM_C_
+#endif /* _HW_VM_C_ */