From 310b5aa239bd007ca01fdf11a325ce615d832ede Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 22 Jun 1999 14:07:40 +0000 Subject: [PATCH] 1999-06-22 Jonathan Larmour * config/tc-arc.c (tc_gen_reloc): Use symbol_get_bfdsym to get at the symbol, rather than accessing the bsym member. * config/tc-d10v.c (tc_gen_reloc): Likewise. * config/tc-d30v.c (tc_gen_reloc): Likewise. * config/tc-mcore.c (tc_gen_reloc): Likewise. * config/tc-mn10200.c (tc_gen_reloc): Likewise. * config/tc-mn10300.c (tc_gen_reloc): Likewise. * config/tc-ns32k.c (tc_gen_reloc): Likewise. * config/tc-tic30.c (tc_gen_reloc): Likewise. * config/tc-v850.c (tc_gen_reloc): Likewise. --- gas/ChangeLog | 13 +++++++++++++ gas/config/tc-arc.c | 10 ++++++---- gas/config/tc-d10v.c | 4 ++-- gas/config/tc-d30v.c | 4 ++-- gas/config/tc-mcore.c | 6 +++--- gas/config/tc-mn10200.c | 6 +++--- gas/config/tc-mn10300.c | 6 +++--- gas/config/tc-ns32k.c | 6 ++++-- gas/config/tc-tic30.c | 5 +++-- gas/config/tc-v850.c | 5 +++-- 10 files changed, 42 insertions(+), 23 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index f5a25119c3..2e15c9210b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,16 @@ +1999-06-22 Jonathan Larmour + + * config/tc-arc.c (tc_gen_reloc): Use symbol_get_bfdsym to get at + the symbol, rather than accessing the bsym member. + * config/tc-d10v.c (tc_gen_reloc): Likewise. + * config/tc-d30v.c (tc_gen_reloc): Likewise. + * config/tc-mcore.c (tc_gen_reloc): Likewise. + * config/tc-mn10200.c (tc_gen_reloc): Likewise. + * config/tc-mn10300.c (tc_gen_reloc): Likewise. + * config/tc-ns32k.c (tc_gen_reloc): Likewise. + * config/tc-tic30.c (tc_gen_reloc): Likewise. + * config/tc-v850.c (tc_gen_reloc): Likewise. + Mon Jun 21 16:45:19 1999 Jeffrey A Law (law@cygnus.com) * tc-hppa.c (elf_hppa_reloc_type): Renamed from elf32_hppa_reloc_type. diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c index c07c2d791a..55543da336 100644 --- a/gas/config/tc-arc.c +++ b/gas/config/tc-arc.c @@ -1,5 +1,5 @@ /* tc-arc.c -- Assembler for the ARC - Copyright (C) 1994, 1995, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1997, 1998, 1999 Free Software Foundation, Inc. Contributed by Doug Evans (dje@cygnus.com). This file is part of GAS, the GNU Assembler. @@ -15,8 +15,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. */ #include #include @@ -1445,7 +1446,8 @@ tc_gen_reloc (section, fixP) reloc = (arelent *) xmalloc (sizeof (arelent)); - reloc->sym_ptr_ptr = &fixP->fx_addsy->bsym; + reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy); reloc->address = fixP->fx_frag->fr_address + fixP->fx_where; reloc->howto = bfd_reloc_type_lookup (stdoutput, fixP->fx_r_type); if (reloc->howto == (reloc_howto_type *) NULL) diff --git a/gas/config/tc-d10v.c b/gas/config/tc-d10v.c index 6080258b6f..2af3e3ea3a 100644 --- a/gas/config/tc-d10v.c +++ b/gas/config/tc-d10v.c @@ -1,5 +1,4 @@ /* tc-d10v.c -- Assembler code for the Mitsubishi D10V - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -1394,7 +1393,8 @@ tc_gen_reloc (seg, fixp) { arelent *reloc; reloc = (arelent *) xmalloc (sizeof (arelent)); - reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym; + reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type); if (reloc->howto == (reloc_howto_type *) NULL) diff --git a/gas/config/tc-d30v.c b/gas/config/tc-d30v.c index 8e93f2ad44..99837ef482 100644 --- a/gas/config/tc-d30v.c +++ b/gas/config/tc-d30v.c @@ -1,5 +1,4 @@ /* tc-d30v.c -- Assembler code for the Mitsubishi D30V - Copyright (C) 1997, 1998, 1999 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -1745,7 +1744,8 @@ tc_gen_reloc (seg, fixp) { arelent *reloc; reloc = (arelent *) xmalloc (sizeof (arelent)); - reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym; + reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type); if (reloc->howto == (reloc_howto_type *) NULL) diff --git a/gas/config/tc-mcore.c b/gas/config/tc-mcore.c index 28790df406..49db23b11f 100644 --- a/gas/config/tc-mcore.c +++ b/gas/config/tc-mcore.c @@ -1,6 +1,5 @@ /* tc-mcore.c -- Assemble code for M*Core - - Copyright (C) 1993,1994, 1999 Free Software Foundation. + Copyright (C) 1999 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -2117,7 +2116,8 @@ tc_gen_reloc (section, fixp) } rel = (arelent *) xmalloc (sizeof (arelent)); - rel->sym_ptr_ptr = & fixp->fx_addsy->bsym; + rel->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *rel->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); rel->address = fixp->fx_frag->fr_address + fixp->fx_where; /* Always pass the addend along! */ rel->addend = fixp->fx_addnumber; diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c index 2380915910..264f7bf001 100644 --- a/gas/config/tc-mn10200.c +++ b/gas/config/tc-mn10200.c @@ -1,6 +1,5 @@ /* tc-mn10200.c -- Assembler code for the Matsushita 10200 - - Copyright (C) 1996, 1997, 1998 Free Software Foundation. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -1252,7 +1251,8 @@ tc_gen_reloc (seg, fixp) } else { - reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym; + reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); reloc->addend = fixp->fx_offset; } return reloc; diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c index 3f9e9cee7d..4f146d13e5 100644 --- a/gas/config/tc-mn10300.c +++ b/gas/config/tc-mn10300.c @@ -1,6 +1,5 @@ /* tc-mn10300.c -- Assembler code for the Matsushita 10300 - - Copyright (C) 1996, 1997, 1998 Free Software Foundation. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -1445,7 +1444,8 @@ tc_gen_reloc (seg, fixp) } else { - reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym; + reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof( asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); reloc->addend = fixp->fx_offset; } return reloc; diff --git a/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c index 42dc528388..6457aeafa3 100644 --- a/gas/config/tc-ns32k.c +++ b/gas/config/tc-ns32k.c @@ -1,5 +1,6 @@ /* ns32k.c -- Assemble on the National Semiconductor 32k series - Copyright (C) 1987, 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1987, 92, 93, 94, 95, 96, 97, 98, 1999 + Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -2264,7 +2265,8 @@ tc_gen_reloc (section, fixp) code = reloc(fixp->fx_size, fixp->fx_pcrel, fix_im_disp(fixp)); rel = (arelent *) xmalloc (sizeof (arelent)); - rel->sym_ptr_ptr = &fixp->fx_addsy->bsym; + rel->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *rel->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); rel->address = fixp->fx_frag->fr_address + fixp->fx_where; if (fixp->fx_pcrel) rel->addend = fixp->fx_addnumber; diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c index 61ed905e47..255c06a381 100644 --- a/gas/config/tc-tic30.c +++ b/gas/config/tc-tic30.c @@ -1,5 +1,5 @@ /* tc-c30.c -- Assembly code for the Texas Instruments TMS320C30 - Copyright (C) 1998 Free Software Foundation. + Copyright (C) 1998, 1999 Free Software Foundation. Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au) This file is part of GAS, the GNU Assembler. @@ -1842,7 +1842,8 @@ tc_gen_reloc (section, fixP) rel = (arelent *) xmalloc (sizeof (arelent)); assert (rel != 0); - rel->sym_ptr_ptr = &fixP->fx_addsy->bsym; + rel->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *rel->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy); rel->address = fixP->fx_frag->fr_address + fixP->fx_where; if (fixP->fx_pcrel) rel->addend = fixP->fx_addnumber; diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c index c8ab145ade..d85cfce9ea 100644 --- a/gas/config/tc-v850.c +++ b/gas/config/tc-v850.c @@ -1,5 +1,5 @@ /* tc-v850.c -- Assembler code for the NEC V850 - Copyright (C) 1996, 1997, 1998 Free Software Foundation. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation. This file is part of GAS, the GNU Assembler. @@ -2243,7 +2243,8 @@ tc_gen_reloc (seg, fixp) arelent * reloc; reloc = (arelent *) xmalloc (sizeof (arelent)); - reloc->sym_ptr_ptr = & fixp->fx_addsy->bsym; + reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr= symbol_get_bfdsym (fixp->fx_addsy); reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type);