X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=2530edda9fad6b58042c43fddb1ae30641433f7d;hb=159fdb19228cfb04c3fd871ab3f41f8ef7984b58;hp=067986f6d28409116647f09683e3924908b0e55d;hpb=890f22ef8eff8dbb5b31fa221dfce65a7b84c202;p=ghc-hetmet.git diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index 067986f..2530edd 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -156,7 +156,6 @@ void initRtsFlagsDefaults(void) #ifdef THREADED_RTS RtsFlags.ParFlags.nNodes = 1; RtsFlags.ParFlags.migrate = rtsTrue; - RtsFlags.ParFlags.wakeupMigrate = rtsFalse; RtsFlags.ParFlags.parGcEnabled = 1; RtsFlags.ParFlags.parGcGen = 0; RtsFlags.ParFlags.parGcLoadBalancingEnabled = rtsTrue; @@ -306,7 +305,7 @@ usage_text[] = { " -Da DEBUG: apply", " -Dl DEBUG: linker", " -Dm DEBUG: stm", -" -Dz DEBUG: stack squezing", +" -Dz DEBUG: stack squeezing", " -Dc DEBUG: program coverage", " -Dr DEBUG: sparks", "", @@ -323,7 +322,6 @@ usage_text[] = { " (default: 1, -qb alone turns off load-balancing)", " -qa Use the OS to set thread affinity (experimental)", " -qm Don't automatically migrate threads between CPUs", -" -qw Migrate a thread to the current CPU when it is woken up", #endif " --install-signal-handlers=", " Install signal handlers (default: yes)", @@ -1067,10 +1065,10 @@ error = rtsTrue; case 'm': RtsFlags.ParFlags.migrate = rtsFalse; break; - case 'w': - RtsFlags.ParFlags.wakeupMigrate = rtsTrue; - break; - default: + case 'w': + // -qw was removed; accepted for backwards compat + break; + default: errorBelch("unknown RTS option: %s",rts_argv[arg]); error = rtsTrue; break;