gas: sparc: fix collision of registers and pseudo-ops.

[deliverable/binutils-gdb.git] / gas / config / tc-pj.h

diff --git a/gas/config/tc-pj.h b/gas/config/tc-pj.h
index 52d33d2c6271ce8558cfd7ca5dbb7e6602d763aa..6cfd0c8067a2c6701a5be7f70c4972091556053c 100644 (file)
--- a/gas/config/tc-pj.h
+++ b/gas/config/tc-pj.h
@@ -1,5 +1,5 @@
 /* This file is tc-pj.h
 /* This file is tc-pj.h

-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999-2016 Free Software Foundation, Inc.

 
    Contributed by Steve Chamberlain of Transmeta, sac@pobox.com
 
 
    Contributed by Steve Chamberlain of Transmeta, sac@pobox.com
 


@@ -7,7 +7,7 @@
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to
 
    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.  */
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 /* Contributed by Steve Chamberlain, of Transmeta. sac@pobox.com.  */
 
 
 /* Contributed by Steve Chamberlain, of Transmeta. sac@pobox.com.  */
 


@@ -31,28 +31,31 @@
    ? "Pico Java GAS Big Endian"                                        \
    : "Pico Java GAS Little Endian")
 
    ? "Pico Java GAS Big Endian"                                        \
    : "Pico Java GAS Little Endian")
 

-void pj_cons_fix_new_pj PARAMS ((struct frag *, int, int, expressionS *));
-arelent *tc_gen_reloc PARAMS((asection *section, struct fix *fixp));
+void pj_cons_fix_new_pj (struct frag *, int, int, expressionS *,
+                        bfd_reloc_code_real_type);
+arelent *tc_gen_reloc (asection *, struct fix *);

 
 #define md_section_align(SEGMENT, SIZE)     (SIZE)
 
 #define md_section_align(SEGMENT, SIZE)     (SIZE)

-#define md_convert_frag(B, S, F)            (as_fatal (_("convert_frag\n")), 0)
+#define md_convert_frag(B, S, F)            as_fatal (_("convert_frag\n"))

 #define md_estimate_size_before_relax(A, B) (as_fatal (_("estimate size\n")),0)
 #define md_undefined_symbol(NAME)           0
 
 /* PC relative operands are relative to the start of the opcode, and
    the operand is always one byte into the opcode.  */
 
 #define md_estimate_size_before_relax(A, B) (as_fatal (_("estimate size\n")),0)
 #define md_undefined_symbol(NAME)           0
 
 /* PC relative operands are relative to the start of the opcode, and
    the operand is always one byte into the opcode.  */
 

-#define md_pcrel_from(FIXP)                                            \
-       ((FIXP)->fx_where + (FIXP)->fx_frag->fr_address - 1)
+#define md_pcrel_from(FIX)                                             \
+       ((FIX)->fx_where + (FIX)->fx_frag->fr_address - 1)

 
 

-#define TC_CONS_FIX_NEW(FRAG, WHERE, NBYTES, EXP) \
-       pj_cons_fix_new_pj (FRAG, WHERE, NBYTES, EXP)
+#define TC_CONS_FIX_NEW(FRAG, WHERE, NBYTES, EXP, RELOC)       \
+       pj_cons_fix_new_pj (FRAG, WHERE, NBYTES, EXP, RELOC)

 
 

-/* Always leave vtable relocs untouched in the output.  */
-#define TC_FORCE_RELOCATION(FIX)                                       \
-          ((FIX)->fx_r_type == BFD_RELOC_VTABLE_INHERIT                \
-          || (FIX)->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
+/* No shared lib support, so we don't need to ensure externally
+   visible symbols can be overridden.  */
+#define EXTERN_FORCE_RELOC 0

 
 

-#define obj_fix_adjustable(FIX)                                        \
-          (! ((FIX)->fx_r_type == BFD_RELOC_VTABLE_INHERIT             \
+/* Values passed to md_apply_fix don't include the symbol value.  */
+#define MD_APPLY_SYM_VALUE(FIX) 0
+
+#define tc_fix_adjustable(FIX)                                         \
+          (! ((FIX)->fx_r_type == BFD_RELOC_VTABLE_INHERIT             \

           || (FIX)->fx_r_type == BFD_RELOC_VTABLE_ENTRY))
           || (FIX)->fx_r_type == BFD_RELOC_VTABLE_ENTRY))