diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-05-19 16:58:56 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:21:31 +0200 |
| commit | 91bc2da61f6ea5617bf0161f65a9b36de93783f8 (patch) | |
| tree | 8eb0428b861918b200f29796cd6ac151f10a0c9f /chromium | |
| parent | b0b69eacfc171f2ef7f012f4be372c0713211d08 (diff) | |
| download | qtwebengine-chromium-91bc2da61f6ea5617bf0161f65a9b36de93783f8.tar.gz | |
<v8> 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
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Change-Id: I567a72c18f43a483e7576e880c2d383873f5660f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium')
| -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; } } |