Merge master into threading to add support for VFP

2014-05-16 22:24:34 -04:00 · 2014-05-16 22:24:34 -04:00 · 0b1ba2f37a
commit 0b1ba2f37a
parent 4fba4f36bf a4fd257469
33 changed files with 14281 additions and 189 deletions
--- a/src/core/arm/interpreter/arm_interpreter.cpp
+++ b/src/core/arm/interpreter/arm_interpreter.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.  

-#include "arm_interpreter.h"
+#include "core/arm/interpreter/arm_interpreter.h"

 const static cpu_config_t s_arm11_cpu_info = {
    "armv6", "arm11", 0x0007b000, 0x0007f000, NONCACHE