diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6d6e1c857e..501607b8b2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2004-02-22  Mark Kettenis  <kettenis@gnu.org>
+
+	* amd64fbsd-tdep.c (amd64fbsd_sigtramp_start_addr): Renamed from
+	amd64fbsd_sigtramp_start.
+	(amd64fbsd_sigtramp_end_addr): Renamed from
+	amd64fbsd_sigtramp_end.
+	(amd64fbsd_init_abi): Adjust for renamed variables.
+	* amd64fbsd-nat.c (_initialize_amd64fbsd_nat): Adjust for renamed
+	variables.
+	* x86-64-tdep.h (amd64fbsd_sigtramp_start_addr): Renamed from
+	amd64fbsd_sigtramp_start.
+	(amd64fbsd_sigtramp_end_addr): Renamed from
+	amd64fbsd_sigtramp_end.
+
 2004-02-22  Andrew Cagney  <cagney@redhat.com>
 
 	* hppa-tdep.c (hppa_gdbarch_init): Re-order separating
diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
index edab8b5670..5f86527620 100644
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64fbsd-nat.c
@@ -228,8 +228,8 @@ Please report this to <bug-gdb@gnu.org>.",
     len = sizeof (ps_strings);
     if (sysctl (mib, 2, &ps_strings, &len, NULL, 0) == 0)
       {
-	amd64fbsd_sigtramp_start = ps_strings - 32;
-	amd64fbsd_sigtramp_end = ps_strings;
+	amd64fbsd_sigtramp_start_addr = ps_strings - 32;
+	amd64fbsd_sigtramp_end_addr = ps_strings;
       }
   }
 }
diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index 3abdb0b616..29f06b3770 100644
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -86,8 +86,8 @@ static int amd64fbsd_r_reg_offset[] =
 };
 
 /* Location of the signal trampoline.  */
-CORE_ADDR amd64fbsd_sigtramp_start = 0x7fffffffffc0;
-CORE_ADDR amd64fbsd_sigtramp_end = 0x7fffffffffe0;
+CORE_ADDR amd64fbsd_sigtramp_start_addr = 0x7fffffffffc0;
+CORE_ADDR amd64fbsd_sigtramp_end_addr = 0x7fffffffffe0;
 
 /* From <machine/signal.h>.  */
 int amd64fbsd_sc_reg_offset[] =
@@ -132,8 +132,8 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   x86_64_init_abi (info, gdbarch);
 
-  tdep->sigtramp_start = amd64fbsd_sigtramp_start;
-  tdep->sigtramp_end = amd64fbsd_sigtramp_end;
+  tdep->sigtramp_start = amd64fbsd_sigtramp_start_addr;
+  tdep->sigtramp_end = amd64fbsd_sigtramp_end_addr;
   tdep->sigcontext_addr = amd64fbsd_sigcontext_addr;
   tdep->sc_reg_offset = amd64fbsd_sc_reg_offset;
   tdep->sc_num_regs = ARRAY_SIZE (amd64fbsd_sc_reg_offset);
diff --git a/gdb/x86-64-tdep.h b/gdb/x86-64-tdep.h
index 8c8e76e9b7..5ec371b683 100644
--- a/gdb/x86-64-tdep.h
+++ b/gdb/x86-64-tdep.h
@@ -70,8 +70,8 @@ extern int amd64nbsd_r_reg_offset[];
 extern int amd64obsd_r_reg_offset[];
 
 /* Variables exported from amd64fbsd-tdep.c.  */
-extern CORE_ADDR amd64fbsd_sigtramp_start;
-extern CORE_ADDR amd64fbsd_sigtramp_end;
+extern CORE_ADDR amd64fbsd_sigtramp_start_addr;
+extern CORE_ADDR amd64fbsd_sigtramp_end_addr;
 extern int amd64fbsd_sc_reg_offset[];
 
 #endif /* x86-64-tdep.h */