diff options
author | Ben Murdoch <benm@google.com> | 2012-04-11 18:30:58 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2012-04-11 18:39:07 +0100 |
commit | 85b71799222b55eb5dd74ea26efe0c64ab655c8c (patch) | |
tree | 0d0fa6be365df4b76fe2985458b3a9b9afd80988 /src/flags.cc | |
parent | 5d4cdbf7a67d3662fa0bee4efdb7edd8daec9b0b (diff) | |
download | android_external_v8-85b71799222b55eb5dd74ea26efe0c64ab655c8c.tar.gz android_external_v8-85b71799222b55eb5dd74ea26efe0c64ab655c8c.tar.bz2 android_external_v8-85b71799222b55eb5dd74ea26efe0c64ab655c8c.zip |
Roll V8 back to 3.6
Roll back to V8 3.6 to fix x86 build, we don't have ucontext.h.
This reverts commits:
5d4cdbf7a67d3662fa0bee4efdb7edd8daec9b0b
c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9
592a9fc1d8ea420377a2e7efd0600e20b058be2b
Bug: 5688872
Change-Id: Ic961bb5e65b778e98bbfb71cce71d99fa949e995
Diffstat (limited to 'src/flags.cc')
-rw-r--r-- | src/flags.cc | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/flags.cc b/src/flags.cc index 5720cbda..ab5b57ce 100644 --- a/src/flags.cc +++ b/src/flags.cc @@ -411,7 +411,7 @@ int FlagList::SetFlagsFromCommandLine(int* argc, for (int k = i; k < *argc; k++) { js_argv[k - start_pos] = StrDup(argv[k]); } - *flag->args_variable() = JSArguments::Create(js_argc, js_argv); + *flag->args_variable() = JSArguments(js_argc, js_argv); i = *argc; // Consume all arguments break; } @@ -534,10 +534,18 @@ void FlagList::PrintHelp() { } } - -void FlagList::EnforceFlagImplications() { -#define FLAG_MODE_DEFINE_IMPLICATIONS -#include "flag-definitions.h" +JSArguments::JSArguments() + : argc_(0), argv_(NULL) {} +JSArguments::JSArguments(int argc, const char** argv) + : argc_(argc), argv_(argv) {} +int JSArguments::argc() const { return argc_; } +const char** JSArguments::argv() { return argv_; } +const char*& JSArguments::operator[](int idx) { return argv_[idx]; } +JSArguments& JSArguments::operator=(JSArguments args) { + argc_ = args.argc_; + argv_ = args.argv_; + return *this; } + } } // namespace v8::internal |