diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-05-19 16:58:56 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2014-05-19 17:21:04 +0200 |
| commit | a6dd70e0328d155d5df8d6df48afbab690b08fb6 (patch) | |
| tree | 3fcc9fd73f556c7dc7a18cf56b6df074170f08a3 | |
| parent | 1b5dc494c6547be044ab5fed57dc0419bba3f950 (diff) | |
| download | qtwebengine-chromium-a6dd70e0328d155d5df8d6df48afbab690b08fb6.tar.gz | |
fix ARMv6 detection for v8.
The linux kernel now reports the processor information
in "model name" and not in "Processor" anymore.
Both should be checked for backwards compatibility.
As described by:
https://code.google.com/p/v8/issues/detail?id=3112#c16
Change-Id: I8828c1a567281e0d7000106338a2033627e8e397
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | chromium/v8/src/cpu.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/v8/src/cpu.cc b/chromium/v8/src/cpu.cc index 2bf51a7f6c0..e67b397f917 100644 --- a/chromium/v8/src/cpu.cc +++ b/chromium/v8/src/cpu.cc @@ -380,10 +380,12 @@ CPU::CPU() : stepping_(0), // ARMv6 device that reports architecture 7. if (architecture_ == 7) { char* processor = cpu_info.ExtractField("Processor"); - if (HasListItem(processor, "(v6l)")) { + char* model_name = cpu_info.ExtractField("model name"); + if (HasListItem(processor, "(v6l)") || HasListItem(model_name, "(v6l)")) { architecture_ = 6; } delete[] processor; + delete[] model_name; } } |