diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0f5d4d99bb..ec6d26a70a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-04  Pedro Alves  <palves@redhat.com>
+
+	* gdbarch.sh (gdb_signal_from_target): Mention that the
+	implementation of the method must be host independent.
+	* gdbarch.h: Regenerate.
+
 2012-06-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* symfile-mem.c: 3 new gdb_static_assert for target_read_memory_bfd
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 5d73d7272c..da449c2a65 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -940,10 +940,13 @@ extern int gdbarch_process_record_signal (struct gdbarch *gdbarch, struct regcac
 extern void set_gdbarch_process_record_signal (struct gdbarch *gdbarch, gdbarch_process_record_signal_ftype *process_record_signal);
 
 /* Signal translation: translate inferior's signal (target's) number
-   into GDB's representation.  This is mainly used when cross-debugging
-   core files --- "Live" targets hide the translation behind the target
-   interface (target_wait, target_resume, etc.).  The default is to do
-   the translation using host signal numbers. */
+   into GDB's representation.  The implementation of this method must
+   be host independent.  IOW, don't rely on symbols of the NAT_FILE
+   header (the nm-*.h files), the host <signal.h> header, or similar
+   headers.  This is mainly used when cross-debugging core files ---
+   "Live" targets hide the translation behind the target interface
+   (target_wait, target_resume, etc.).  The default is to do the
+   translation using host signal numbers. */
 
 typedef enum gdb_signal (gdbarch_gdb_signal_from_target_ftype) (struct gdbarch *gdbarch, int signo);
 extern enum gdb_signal gdbarch_gdb_signal_from_target (struct gdbarch *gdbarch, int signo);
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index cc1fe654a0..5cefdab8d3 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -773,10 +773,13 @@ M:int:process_record:struct regcache *regcache, CORE_ADDR addr:regcache, addr
 M:int:process_record_signal:struct regcache *regcache, enum gdb_signal signal:regcache, signal
 
 # Signal translation: translate inferior's signal (target's) number
-# into GDB's representation.  This is mainly used when cross-debugging
-# core files --- "Live" targets hide the translation behind the target
-# interface (target_wait, target_resume, etc.).  The default is to do
-# the translation using host signal numbers.
+# into GDB's representation.  The implementation of this method must
+# be host independent.  IOW, don't rely on symbols of the NAT_FILE
+# header (the nm-*.h files), the host <signal.h> header, or similar
+# headers.  This is mainly used when cross-debugging core files ---
+# "Live" targets hide the translation behind the target interface
+# (target_wait, target_resume, etc.).  The default is to do the
+# translation using host signal numbers.
 m:enum gdb_signal:gdb_signal_from_target:int signo:signo::default_gdb_signal_from_target::0
 
 # Extra signal info inspection.