From fb338f1d79bf2e003a78c8bc6003c409512ca1ed Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Wed, 2 Mar 1994 20:02:17 +0000
Subject: [PATCH]         * config/tc-hppa.c: Add a few casts to make HP C
 compiler happy.

        * config/obj-som.c (obj_som_version, obj_som_copyright): Be prepared
        to handle an error from bfd_som_attach_aux_hdr.
---
 gas/ChangeLog        |  6 ++++++
 gas/config/tc-hppa.c | 13 ++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6c7c5415480..6c65c4041f9 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,11 @@
 Wed Mar  2 10:31:01 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
+        * config/tc-hppa.c: Add a few casts to make HP C compiler happy.
+
+        * config/obj-som.c (obj_som_version, obj_som_copyright): Be
+	prepared
+        to handle an error from bfd_som_attach_aux_hdr.
+
 	* config/tc-hppa.h: Wrap ELF specific decls inside an ifdef.
 
 Mon Feb 28 15:03:26 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 3f6c6a4d4ab..7539f036e9b 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -1205,7 +1205,7 @@ fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel,
     new_fix = fix_new_exp (frag, where, size, exp, pcrel, r_type);
   else
     new_fix = fix_new (frag, where, size, add_symbol, offset, pcrel, r_type);
-  new_fix->tc_fix_data = hppa_fix;
+  new_fix->tc_fix_data = (void *) hppa_fix;
   hppa_fix->fx_r_type = r_type;
   hppa_fix->fx_r_field = r_field;
   hppa_fix->fx_r_format = r_format;
@@ -2580,7 +2580,7 @@ tc_gen_reloc (section, fixp)
      fixS *fixp;
 {
   arelent *reloc;
-  struct hppa_fix_struct *hppa_fixp = fixp->tc_fix_data;
+  struct hppa_fix_struct *hppa_fixp;
   bfd_reloc_code_real_type code;
   static int unwind_reloc_fixp_cnt = 0;
   static arelent *unwind_reloc_entryP = NULL;
@@ -2590,6 +2590,7 @@ tc_gen_reloc (section, fixp)
   int n_relocs;
   int i;
 
+  hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data;
   if (fixp->fx_addsy == 0)
     return &no_relocs;
   assert (hppa_fixp != 0);
@@ -2951,11 +2952,12 @@ md_apply_fix (fixP, valp)
      valueT *valp;
 {
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
-  struct hppa_fix_struct *hppa_fixP = fixP->tc_fix_data;
+  struct hppa_fix_struct *hppa_fixP;
   long new_val, result;
   unsigned int w1, w2, w;
   valueT val = *valp;
 
+  hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data;
   /* SOM uses R_HPPA_ENTRY and R_HPPA_EXIT relocations which can 
      never be "applied" (they are just markers).  */
 #ifdef OBJ_SOM
@@ -6161,7 +6163,7 @@ hppa_fix_adjustable (fixp)
 {
   struct hppa_fix_struct *hppa_fix;
 
-  hppa_fix = fixp->tc_fix_data;
+  hppa_fix = (struct hppa_fix_struct *) fixp->tc_fix_data;
 
   if (fixp->fx_r_type == R_HPPA && hppa_fix->fx_r_format == 32)
     return 0;
@@ -6181,8 +6183,9 @@ int
 hppa_force_relocation (fixp)
      fixS *fixp;
 {
-  struct hppa_fix_struct *hppa_fixp = fixp->tc_fix_data;
+  struct hppa_fix_struct *hppa_fixp;
 
+  hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data;
 #ifdef OBJ_SOM
   if (fixp->fx_r_type == R_HPPA_ENTRY || fixp->fx_r_type == R_HPPA_EXIT)
     return 1;
-- 
2.30.2