diff options
author | Carl Shapiro <cshapiro@google.com> | 2010-08-05 22:11:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 22:11:37 -0700 |
commit | 5c828312261834e42147f7cd7b30003165df85fb (patch) | |
tree | b2d6b6a5f6b8661ec86565f821303fd8f92c6584 | |
parent | e52dbd50a4e47f368b6fe82fac3965d9ab6d6556 (diff) | |
parent | b0691476e24deae014dadbdbbceabc72d5a96ae6 (diff) | |
download | android_dalvik-5c828312261834e42147f7cd7b30003165df85fb.tar.gz android_dalvik-5c828312261834e42147f7cd7b30003165df85fb.tar.bz2 android_dalvik-5c828312261834e42147f7cd7b30003165df85fb.zip |
am b0691476: Remove stale overwritefree flag.
Merge commit 'b0691476e24deae014dadbdbbceabc72d5a96ae6' into dalvik-dev
* commit 'b0691476e24deae014dadbdbbceabc72d5a96ae6':
Remove stale overwritefree flag.
-rw-r--r-- | vm/Globals.h | 1 | ||||
-rw-r--r-- | vm/Init.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/vm/Globals.h b/vm/Globals.h index 5341d262a..90e9e88c2 100644 --- a/vm/Globals.h +++ b/vm/Globals.h @@ -119,7 +119,6 @@ struct DvmGlobals { * GC option flags. */ bool preciseGc; - bool overwriteFree; bool preVerify; bool postVerify; bool generateRegisterMaps; @@ -115,7 +115,6 @@ static void dvmUsage(const char* progName) dvmFprintf(stderr, " -Xdeadlockpredict:{off,warn,err,abort}\n"); dvmFprintf(stderr, " -Xstacktracefile:<filename>\n"); dvmFprintf(stderr, " -Xgc:[no]precise\n"); - dvmFprintf(stderr, " -Xgc:[no]overwritefree\n"); dvmFprintf(stderr, " -Xgc:[no]preverify\n"); dvmFprintf(stderr, " -Xgc:[no]postverify\n"); dvmFprintf(stderr, " -Xgc:[no]concurrent\n"); @@ -975,10 +974,6 @@ static int dvmProcessOptions(int argc, const char* const argv[], gDvm.preciseGc = true; else if (strcmp(argv[i] + 5, "noprecise") == 0) gDvm.preciseGc = false; - else if (strcmp(argv[i] + 5, "overwritefree") == 0) - gDvm.overwriteFree = true; - else if (strcmp(argv[i] + 5, "nooverwritefree") == 0) - gDvm.overwriteFree = false; else if (strcmp(argv[i] + 5, "preverify") == 0) gDvm.preVerify = true; else if (strcmp(argv[i] + 5, "nopreverify") == 0) |