diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d78fe9f47f..37a13149ab3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-02  Richard Henderson  <rth@redhat.com>
+
+	* alpha-tdep.c (alpha_register_virtual_type): Use alpha-specific
+	regnum identifiers.
+	(alpha_sigtramp_register_address): Likewise.
+
 2003-06-02  Richard Henderson  <rth@redhat.com>
 
 	* alpha-tdep.c (alpha_supply_int_regs, alpha_fill_int_regs): New.
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 74e891baffa..50d5dea4bec 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -96,7 +96,7 @@ alpha_register_virtual_type (int regno)
 
   /* Don't need to worry about little vs big endian until 
      some jerk tries to port to alpha-unicosmk.  */
-  if (regno >= FP0_REGNUM && regno < FP0_REGNUM + 31)
+  if (regno >= ALPHA_FP0_REGNUM && regno < ALPHA_FP0_REGNUM + 31)
     return builtin_type_ieee_double_little;
 
   return builtin_type_int64;
@@ -747,9 +747,9 @@ alpha_sigtramp_register_address (CORE_ADDR sigcontext_addr, unsigned int regno)
 { 
   if (regno < 32)
     return sigcontext_addr + SIGFRAME_REGSAVE_OFF + regno * 8;
-  if (regno >= FP0_REGNUM && regno < FP0_REGNUM + 32)
+  if (regno >= ALPHA_FP0_REGNUM && regno < ALPHA_FP0_REGNUM + 32)
     return sigcontext_addr + SIGFRAME_FPREGSAVE_OFF + regno * 8;
-  if (regno == PC_REGNUM)
+  if (regno == ALPHA_PC_REGNUM)
     return sigcontext_addr + SIGFRAME_PC_OFF; 
 
   return 0;