tc-z8k.c: make some argument types bfd_reloc_code_real_type

gas/ChangeLog:

2016-07-19  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>

	* config/tc-z8k.c (newfix): Make type of type argument
	bfd_reloc_code_real_type.
	(apply_fix): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index eaaf1081283e32918190cb2c4c5cd28b661b6288..31da783d10a4b4a2a31932d498d0f892b3d36356 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-19  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+       * config/tc-z8k.c (newfix): Make type of type argument
+       bfd_reloc_code_real_type.
+       (apply_fix): Likewise.
+
 2016-07-16  Alan Modra  <amodra@gmail.com>
 
        * config/tc-epiphany.c: Don't include libbfd.h.

diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index 265adc6ac24f8304b74c4ca296c518d91641425d..9b6ee3867a5761f790938db9db198a3635e8887d 100644 (file)
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -956,9 +956,8 @@ get_specific (opcode_entry_type *opcode, op_type *operands)
 static char buffer[20];
 
 static void
-newfix (int ptr, int type, int size, expressionS *operand)
+newfix (int ptr, bfd_reloc_code_real_type type, int size, expressionS *operand)
 {
-  int is_pcrel = 0;
   fixS *fixP;
 
   /* Size is in nibbles.  */
@@ -966,12 +965,17 @@ newfix (int ptr, int type, int size, expressionS *operand)
       || operand->X_op_symbol
       || operand->X_add_number)
     {
+      int is_pcrel;
       switch(type)
         {
         case BFD_RELOC_8_PCREL:
         case BFD_RELOC_Z8K_CALLR:
         case BFD_RELOC_Z8K_DISP7:
           is_pcrel = 1;
+         break;
+       default:
+         is_pcrel = 0;
+         break;
         }
       fixP = fix_new_exp (frag_now, ptr, size / 2,
                           operand, is_pcrel, type);
@@ -981,7 +985,8 @@ newfix (int ptr, int type, int size, expressionS *operand)
 }
 
 static char *
-apply_fix (char *ptr, int type, expressionS *operand, int size)
+apply_fix (char *ptr, bfd_reloc_code_real_type type, expressionS *operand,
+          int size)
 {
   long n = operand->X_add_number;