diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 50418a74e9..64278e0cf6 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-trace.c (trace_option_handler): Move cpu_nr decl behind
+	the SIM_HAVE_ADDR_RANGE define.
+
 2010-03-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-core.h (device_error): Add const to message, and add printf
diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index 9bb24582cb..478cbfa27d 100644
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -233,7 +233,6 @@ trace_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
 		      char *arg, int is_command)
 {
   int n;
-  int cpu_nr;
 
   switch (opt)
     {
@@ -353,6 +352,7 @@ trace_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
     case OPTION_TRACE_RANGE :
       if (WITH_TRACE)
 	{
+	  int cpu_nr;
 	  char *chp = arg;
 	  unsigned long start,end;
 	  start = strtoul (chp, &chp, 0);