diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
| commit | 1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 (patch) | |
| tree | edee61faabd18b4a5d84e8cdb679d7a8d1fe171f /gnu/usr.bin/binutils/gas/obj.h | |
| parent | 9f1193e30b5f04af9ea81c644eec79b7b535b890 (diff) | |
Help stupid cvs fixing basic conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/gas/obj.h')
| -rw-r--r-- | gnu/usr.bin/binutils/gas/obj.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/usr.bin/binutils/gas/obj.h b/gnu/usr.bin/binutils/gas/obj.h index 32441551dee..7fe5551811d 100644 --- a/gnu/usr.bin/binutils/gas/obj.h +++ b/gnu/usr.bin/binutils/gas/obj.h @@ -1,7 +1,8 @@ /* obj.h - defines the object dependent hooks for all object format backends. - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. + Copyright (C) 1987, 90, 91, 92, 93, 95, 96, 97, 99, 2000 + Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,8 +17,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + along with GAS; see the file COPYING. If not, write to the Free + Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ char *obj_default_output_file_name PARAMS ((void)); void obj_emit_relocations PARAMS ((char **where, fixS * fixP, @@ -55,8 +57,10 @@ struct format_ops { void (*s_set_size) PARAMS ((symbolS *, bfd_vma)); bfd_vma (*s_get_align) PARAMS ((symbolS *)); void (*s_set_align) PARAMS ((symbolS *, bfd_vma)); + int (*s_get_other) PARAMS ((symbolS *)); + int (*s_get_desc) PARAMS ((symbolS *)); void (*copy_symbol_attributes) PARAMS ((symbolS *, symbolS *)); - void (*generate_asm_lineno) PARAMS ((const char *, int)); + void (*generate_asm_lineno) PARAMS ((void)); void (*process_stab) PARAMS ((segT, int, const char *, int, int, int)); int (*sec_sym_ok_for_reloc) PARAMS ((asection *)); void (*pop_insert) PARAMS ((void)); @@ -69,6 +73,8 @@ struct format_ops { extern const struct format_ops elf_format_ops; extern const struct format_ops ecoff_format_ops; +extern const struct format_ops coff_format_ops; +extern const struct format_ops aout_format_ops; #ifndef this_format COMMON const struct format_ops *this_format; |