summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/binutils/bfd/elf32-hppa.h
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-05-17 21:54:57 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-05-17 21:54:57 +0000
commit631eeff208608ed7b44459bd6c8ae905bcd7e8b6 (patch)
tree7be124105a0929655708fbbc134f9c2e3189c3f3 /gnu/usr.bin/binutils/bfd/elf32-hppa.h
parenta7c8e0ae4a4b349099d02bc9d56bcf1979c0f0c3 (diff)
Resolve merge conflicts, adjust method of W^X handing (.sh files)
remove testsuites (not useable) remove mmalloc (not part of new binutils).
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/elf32-hppa.h')
-rw-r--r--gnu/usr.bin/binutils/bfd/elf32-hppa.h21
1 files changed, 15 insertions, 6 deletions
diff --git a/gnu/usr.bin/binutils/bfd/elf32-hppa.h b/gnu/usr.bin/binutils/bfd/elf32-hppa.h
index eda452b4b3f..7c8c687c499 100644
--- a/gnu/usr.bin/binutils/bfd/elf32-hppa.h
+++ b/gnu/usr.bin/binutils/bfd/elf32-hppa.h
@@ -4,8 +4,8 @@
in the Stratus FTX/Golf Object File Format (SED-1762) dated
February 1994.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
- Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+ 2002 Free Software Foundation, Inc.
Written by:
@@ -36,17 +36,26 @@
#include "libhppa.h"
#include "elf/hppa.h"
-boolean elf32_hppa_size_stubs
- PARAMS ((bfd *, bfd *, struct bfd_link_info *, boolean, bfd_signed_vma,
+int elf32_hppa_setup_section_lists
+ PARAMS ((bfd *, struct bfd_link_info *));
+
+void elf32_hppa_next_input_section
+ PARAMS ((struct bfd_link_info *, asection *));
+
+bfd_boolean elf32_hppa_size_stubs
+ PARAMS ((bfd *, bfd *, struct bfd_link_info *, bfd_boolean, bfd_signed_vma,
asection * (*) PARAMS ((const char *, asection *)),
void (*) PARAMS ((void))));
-boolean elf32_hppa_set_gp
+bfd_boolean elf32_hppa_set_gp
PARAMS ((bfd *, struct bfd_link_info *));
-boolean elf32_hppa_build_stubs
+bfd_boolean elf32_hppa_build_stubs
PARAMS ((struct bfd_link_info *));
+elf_hppa_reloc_type elf32_hppa_reloc_final_type
+ PARAMS ((bfd *, elf_hppa_reloc_type, int, unsigned int));
+
extern elf_hppa_reloc_type ** _bfd_elf32_hppa_gen_reloc_type
PARAMS ((bfd *, elf_hppa_reloc_type, int, unsigned int, int, asymbol *));