From 69bd93682e164d0399a8399825ec527afc16c6e8 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Thu, 6 Feb 2003 01:23:41 +0000 Subject: dwarf2out.c (mem_loc_descriptor): Replace ASM_SIMPLIFY_DWARF_ADDR with *targetm.delegitimize_address. * dwarf2out.c (mem_loc_descriptor): Replace ASM_SIMPLIFY_DWARF_ADDR with *targetm.delegitimize_address. (rtl_for_decl_location): Likewise. * dwarfout.c (output_mem_loc_descriptor): Likewise. Include target.h. * Makefile.in (dwarf2out.c, dwarfout.c): Depend upon $(TARGET_H) * config/i386/i386.h (ASM_SIMPLIFY_DWARF_ADDR): Remove definition. * config/i386/i386-protos.h (i386_simplify_dwarf_addr): Remove prototype. * config/i386/i386.c (ix86_delegitimize_address): Renamed from i386_simplify_dwarf_addr. Made static. Prototyped. (TARGET_DELEGITIMIZE_ADDRESS): Update definition from i386_simplify_dwarf_addr to ix86_delegitimize_address. (ix86_find_base_term): Likewise. (maybe_get_pool_constant): Likewise. * config/s390/s390.h (ASM_SIMPLIFY_DWARF_ADDR): Remove definition. * config/s390/s390-protos.h (s390_simplify_dwarf_addr): Remove prototype. * config/s390/s390.c (s390_delegitimize_address): Renamed from s390_simplify_dwarf_addr. Made static. Prototyped. (TARGET_DELEGITIMIZE_ADDRESS): Define as s390_delegitimize_address. From-SVN: r62468 --- gcc/dwarf2out.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'gcc/dwarf2out.c') diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 7f1418d..435b5c0 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -1,6 +1,6 @@ /* Output Dwarf2 format symbol table information from the GNU C compiler. - Copyright (C) 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003 Free Software Foundation, Inc. Contributed by Gary Funck (gary@intrepid.com). Derived from DWARF 1 implementation of Ron Guilmette (rfg@monkeys.com). Extensively modified by Jason Merrill (jason@cygnus.com). @@ -8270,9 +8270,7 @@ mem_loc_descriptor (rtl, mode) actually within the array. That's *not* necessarily the same as the zeroth element of the array. */ -#ifdef ASM_SIMPLIFY_DWARF_ADDR - rtl = ASM_SIMPLIFY_DWARF_ADDR (rtl); -#endif + rtl = (*targetm.delegitimize_address) (rtl); switch (GET_CODE (rtl)) { @@ -9370,9 +9368,7 @@ rtl_for_decl_location (decl) || (GET_CODE (rtl) == MEM && CONSTANT_P (XEXP (rtl, 0))))) { -#ifdef ASM_SIMPLIFY_DWARF_ADDR - rtl = ASM_SIMPLIFY_DWARF_ADDR (rtl); -#endif + rtl = (*targetm.delegitimize_address) (rtl); return rtl; } rtl = NULL_RTX; @@ -9478,10 +9474,8 @@ rtl_for_decl_location (decl) } } -#ifdef ASM_SIMPLIFY_DWARF_ADDR if (rtl) - rtl = ASM_SIMPLIFY_DWARF_ADDR (rtl); -#endif + rtl = (*targetm.delegitimize_address) (rtl); /* If we don't look past the constant pool, we risk emitting a reference to a constant pool entry that isn't referenced from -- cgit v1.1