(SHT_PROGBITS) [__NetBSD__ && !PT_LOAD]: Don't define.

(SHT_MIPS_DEBUG, HDRR) [__NetBSD__ && __mips__]: Define.

diff --git a/src/unexelf.c b/src/unexelf.c
index 93c0a25cd12dfed984dfe0831d71bd9d6e0bb543..7e298239a713038f9f3b0adc3b4e21c922aae568 100644 (file)
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -479,6 +479,9 @@ typedef struct {
 
 # ifndef PT_LOAD
 #  define PT_LOAD      Elf_pt_load
+#  if 0                                                /* was in pkgsrc patches for 20.7 */
+#   define SHT_PROGBITS Elf_sht_progbits
+#  endif
 #  define SHT_SYMTAB   Elf_sht_symtab
 #  define SHT_DYNSYM   Elf_sht_dynsym
 #  define SHT_NULL     Elf_sht_null
@@ -489,15 +492,20 @@ typedef struct {
 #  define SHN_UNDEF    Elf_eshn_undefined
 #  define SHN_ABS      Elf_eshn_absolute
 #  define SHN_COMMON   Elf_eshn_common
-# endif
+# endif /* !PT_LOAD */
 
 # ifdef __alpha__
 #  include <sys/exec_ecoff.h>
 #  define HDRR         struct ecoff_symhdr
 #  define pHDRR                HDRR *
-# endif
+# endif /* __alpha__ */
 #endif /* __NetBSD__ */
 
+#ifdef __mips__                                        /* was in pkgsrc patches for 20.7 */
+# define SHT_MIPS_DEBUG        DT_MIPS_FLAGS
+# define HDRR          struct Elf_Shdr
+#endif /* __mips__ */
+
 #ifdef __OpenBSD__
 # include <sys/exec_elf.h>
 #endif
@@ -613,7 +621,7 @@ find_section (name, section_names, file_name, old_file_h, old_section_h, noerror
       if (noerror)
        return -1;
       else
-       fatal ("Can't find %s in %s.\n", name, file_name, 0);
+       fatal ("Can't find %s in %s.\n", name, file_name);
     }
 
   return idx;