X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-config.c;h=9da710573d93881741fc804dd5e8568600e8dee6;hb=ce39bd389039d99458950b072550ab52f0a07a34;hp=7e66787dced5d2635bcb3a245de4ceaff4eeb611;hpb=e19418e02e25ae4c62eb95547220897fa6aaf2e0;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/sim-config.c b/sim/common/sim-config.c
index 7e66787dce..9da710573d 100644
--- a/sim/common/sim-config.c
+++ b/sim/common/sim-config.c
@@ -237,7 +237,8 @@ sim_config (SIM_DESC sd)
     }
 #endif
   if (STATE_ENVIRONMENT (sd) == ALL_ENVIRONMENT)
-    STATE_ENVIRONMENT (sd) = DEFAULT_ENVIRONMENT;
+    STATE_ENVIRONMENT (sd) = (WITH_ENVIRONMENT != ALL_ENVIRONMENT ?
+			      WITH_ENVIRONMENT : USER_ENVIRONMENT);
 
 
   /* set the alignment */