From a6dd70e0328d155d5df8d6df48afbab690b08fb6 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Mon, 19 May 2014 16:58:56 +0200 Subject: 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 --- chromium/v8/src/cpu.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } } -- cgit v1.2.1