-extern void elf_frob_symbol PARAMS ((struct symbol *));
-#define obj_frob_symbol(symp, punt) elf_frob_symbol (symp)
+#endif /* SEPARATE_STAB_SECTIONS not defined. */
+
+extern void elf_frob_symbol (symbolS *, int *);
+#ifndef obj_frob_symbol
+#define obj_frob_symbol(symp, punt) elf_frob_symbol (symp, &punt)
+#endif
+
+extern void elf_pop_insert (void);
+#ifndef obj_pop_insert
+#define obj_pop_insert() elf_pop_insert()
+#endif
+
+#ifndef OBJ_MAYBE_ELF
+/* If OBJ_MAYBE_ELF then obj-multi.h will define obj_ecoff_set_ext. */
+#define obj_ecoff_set_ext elf_ecoff_set_ext
+struct ecoff_extr;
+extern void elf_ecoff_set_ext (symbolS *, struct ecoff_extr *);
+#endif
+extern asection *elf_com_section_ptr;
+extern symbolS * elf_common_parse (int ignore ATTRIBUTE_UNUSED, symbolS *symbolP,
+ addressT size);