rename DBX_REGISTER_NUMBER to DEBUGGER_REGNO

gcc/ada/ChangeLog:

	* sigtramp-vxworks-target.h: Rename DBX_REGISTER_NUMBER to
	  DEBUGGER_REGNO.

gcc/ChangeLog:

	* config/aarch64/aarch64-protos.h (aarch64_dbx_regno):
	Rename DBX_REGISTER_NUMBER to DEBUGGER_REGNO.
	(aarch64_debugger_regno): Likewise.
	* config/aarch64/aarch64.cc (aarch64_dbx_regno): Likewise.
	(aarch64_debugger_regno): Likewise.
	* config/aarch64/aarch64.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(DWARF_FRAME_REGNUM): Likewise.
	* config/alpha/alpha.h (DWARF_FRAME_REGNUM): Likewise.
	* config/arc/arc.cc (arc_init_reg_tables): Likewise.
	* config/arc/arc.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/arm/arm-protos.h (arm_dbx_regno): Likewise.
	(arm_debugger_regno): Likewise.
	* config/arm/arm.cc (arm_dbx_regno): Likewise.
	(arm_debugger_regno): Likewise.
	* config/arm/arm.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/bfin/bfin.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/c6x/c6x.cc: Likewise.
	* config/c6x/c6x.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/cris/cris.h (enum reg_class): Likewise.
	(DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/csky/csky.cc (enum reg_class): Likewise.
	* config/csky/csky.h (DWARF_FRAME_REGNUM): Likewise.
	(DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/frv/frv.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/gcn/gcn-hsa.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/gcn/gcn.cc (print_operand): Likewise.
	* config/i386/bsd.h (ASM_QUAD): Likewise.
	* config/i386/cygming.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(DWARF_FRAME_REGNUM): Likewise.
	* config/i386/darwin.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/djgpp.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/dragonfly.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/freebsd.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/gas.h: Likewise.
	* config/i386/gnu-user.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/i386.cc (enum reg_class): Likewise.
	* config/i386/i386.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/i386elf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/iamcu.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/lynx.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/netbsd-elf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/nto.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/openbsdelf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/sysv4.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/vxworks.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/x86-64.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/ia64/ia64-protos.h (ia64_dbx_regno): Likewise.
	(ia64_debugger_regno): Likewise.
	* config/ia64/ia64.cc (ia64_output_function_prologue): Likewise.
	(ia64_dbx_regno): Likewise.
	(ia64_debugger_regno): Likewise.
	(process_cfa_adjust_cfa): Likewise.
	(process_cfa_register): Likewise.
	(ia64_asm_unwind_emit): Likewise.
	* config/ia64/ia64.h: Likewise.
	* config/ia64/sysv4.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/lm32/lm32.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/m32c/m32c.cc (m32c_eh_return_stackadj_rtx): Likewise.
	* config/m32c/m32c.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/m68k/linux.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/m68k/m68k.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(__transfer_from_trampoline): Likewise.
	* config/m68k/m68kelf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/m68k/netbsd-elf.h (M68K_STATIC_CHAIN_REG_NAME): Likewise.
	(DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/microblaze/microblaze.cc (microblaze_option_override): Likewise.
	* config/microblaze/microblaze.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(GP_DBX_FIRST): Likewise.
	(GP_DEBUGGER_FIRST): Likewise.
	* config/mips/vxworks.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/mmix/mmix-protos.h (mmix_dbx_regno): Likewise.
	(mmix_debugger_regno): Likewise.
	* config/mmix/mmix.cc (mmix_dbx_regno): Likewise.
	(mmix_debugger_regno): Likewise.
	* config/mmix/mmix.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/nds32/nds32-protos.h (nds32_dbx_regno): Likewise.
	(nds32_debugger_regno): Likewise.
	* config/nds32/nds32.cc (nds32_dbx_regno): Likewise.
	(nds32_debugger_regno): Likewise.
	(nds32_use_blocks_for_constant_p): Likewise.
	* config/nds32/nds32.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/nvptx/nvptx.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/or1k/or1k.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/pa/pa32-regs.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/pa/pa64-regs.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/rs6000/rs6000-protos.h (rs6000_dbx_regno): Likewise.
	(rs6000_debugger_regno): Likewise.
	* config/rs6000/rs6000.cc (rs6000_dbx_regno): Likewise.
	(rs6000_debugger_regno): Likewise.
	* config/rs6000/rs6000.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(DWARF2_FRAME_REG_OUT): Likewise.
	* config/s390/s390.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/sh/elf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/sh/linux.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/sh/sh.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(SH_DBX_REGISTER_NUMBER): Likewise.
	(SH_DEBUGGER_REGNO): Likewise.
	* config/visium/visium.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/xtensa/elf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/xtensa/linux.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/xtensa/uclinux.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/xtensa/xtensa-protos.h (xtensa_dbx_regno): Likewise.
	(xtensa_debugger_regno): Likewise.
	* config/xtensa/xtensa.cc (xtensa_dbx_regno): Likewise.
	(xtensa_debugger_regno): Likewise.
	* config/xtensa/xtensa.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* defaults.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(DWARF_FRAME_REGNUM): Likewise.
	* doc/tm.texi: Likewise.
	* doc/tm.texi.in: Likewise.
	* dwarf2out.cc (dbx_reg_number): Likewise.
	(debugger_reg_number): Likewise.
	(reg_loc_descriptor): Likewise.
	(multiple_reg_loc_descriptor): Likewise.
	(mem_loc_descriptor): Likewise.
	* except.cc: Likewise.

6 files changed, 6 insertions, 6 deletions

diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
index 527bb4e..fbdccc4 100644
--- a/gcc/config/xtensa/elf.h
+++ b/gcc/config/xtensa/elf.h
@@ -81,7 +81,7 @@ along with GCC; see the file COPYING3.  If not see
 /* Do not force "-fpic" for this target.  */
 #define XTENSA_ALWAYS_PIC 0
 
-#undef DBX_REGISTER_NUMBER
+#undef DEBUGGER_REGNO
 
 /* Search for headers in $tooldir/arch/include and for libraries and
    startfiles in $tooldir/arch/lib.  */
diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
index edce618..540e4bf 100644
--- a/gcc/config/xtensa/linux.h
+++ b/gcc/config/xtensa/linux.h
@@ -67,5 +67,5 @@ along with GCC; see the file COPYING3.  If not see
 /* Always enable "-fpic" for Xtensa Linux.  */
 #define XTENSA_ALWAYS_PIC 1
 
-#undef DBX_REGISTER_NUMBER
+#undef DEBUGGER_REGNO
 
diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
index d47fd63..5fcf639 100644
--- a/gcc/config/xtensa/uclinux.h
+++ b/gcc/config/xtensa/uclinux.h
@@ -70,5 +70,5 @@ along with GCC; see the file COPYING3.  If not see
 #undef TARGET_LIBC_HAS_FUNCTION
 #define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
 
-#undef DBX_REGISTER_NUMBER
+#undef DEBUGGER_REGNO
 
diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h
index e020a33..459e2aa 100644
--- a/gcc/config/xtensa/xtensa-protos.h
+++ b/gcc/config/xtensa/xtensa-protos.h
@@ -71,7 +71,7 @@ extern rtx xtensa_return_addr (int, rtx);
 #endif /* RTX_CODE */
 
 extern void xtensa_setup_frame_addresses (void);
-extern int xtensa_dbx_register_number (int);
+extern int xtensa_debugger_regno (int);
 extern long compute_frame_size (poly_int64);
 extern bool xtensa_use_return_instruction_p (void);
 extern void xtensa_expand_prologue (void);
diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc
index b673b67..93ac656 100644
--- a/gcc/config/xtensa/xtensa.cc
+++ b/gcc/config/xtensa/xtensa.cc
@@ -2430,7 +2430,7 @@ xtensa_cannot_force_const_mem (machine_mode mode ATTRIBUTE_UNUSED, rtx x)
 /* Return the debugger register number to use for 'regno'.  */
 
 int
-xtensa_dbx_register_number (int regno)
+xtensa_debugger_regno (int regno)
 {
   int first = -1;
 
diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
index d51658a..0f3006d 100644
--- a/gcc/config/xtensa/xtensa.h
+++ b/gcc/config/xtensa/xtensa.h
@@ -216,7 +216,7 @@ along with GCC; see the file COPYING3.  If not see
 #define FIRST_PSEUDO_REGISTER 36
 
 /* Return the stabs register number to use for REGNO.  */
-#define DBX_REGISTER_NUMBER(REGNO) xtensa_dbx_register_number (REGNO)
+#define DEBUGGER_REGNO(REGNO) xtensa_debugger_regno (REGNO)
 
 /* 1 for registers that have pervasive standard uses
    and are not available for the register allocator.  */