summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2010-08-05 22:11:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-05 22:11:37 -0700
commit5c828312261834e42147f7cd7b30003165df85fb (patch)
treeb2d6b6a5f6b8661ec86565f821303fd8f92c6584
parente52dbd50a4e47f368b6fe82fac3965d9ab6d6556 (diff)
parentb0691476e24deae014dadbdbbceabc72d5a96ae6 (diff)
downloadandroid_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.h1
-rw-r--r--vm/Init.c5
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;
diff --git a/vm/Init.c b/vm/Init.c
index 872956b8e..232b7a68d 100644
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -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)