diff options
| author | Ricardo Cerqueira <github@cerqueira.org> | 2010-12-23 01:17:35 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <github@cerqueira.org> | 2010-12-23 01:17:35 +0000 |
| commit | d7b0b541bb668105a24e9857e8dcbb47d1a8db49 (patch) | |
| tree | 089d61bdf679abd9f5f11b6fe8fff2178330385e | |
| parent | 317f947a091a4c43655c6d6549a73ab9948ddd23 (diff) | |
| download | android_dalvik-d7b0b541bb668105a24e9857e8dcbb47d1a8db49.tar.gz android_dalvik-d7b0b541bb668105a24e9857e8dcbb47d1a8db49.tar.bz2 android_dalvik-d7b0b541bb668105a24e9857e8dcbb47d1a8db49.zip | |
Fix armv6j codegen templates
These weren't building due to the lack of some new definitions for
gingerbread
Change-Id: I083c447f85f9b20d12937d8560b9479c3129761e
| -rw-r--r-- | vm/compiler/codegen/arm/armv6j/ArchVariant.c | 7 | ||||
| -rw-r--r-- | vm/compiler/codegen/arm/armv6j/Codegen.c | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/vm/compiler/codegen/arm/armv6j/ArchVariant.c b/vm/compiler/codegen/arm/armv6j/ArchVariant.c index e018ea11b..814f410ff 100644 --- a/vm/compiler/codegen/arm/armv6j/ArchVariant.c +++ b/vm/compiler/codegen/arm/armv6j/ArchVariant.c @@ -92,3 +92,10 @@ int dvmCompilerTargetOptHint(int key) } return res; } + +void dvmCompilerGenMemBarrier(CompilationUnit *cUnit) +{ +#if ANDROID_SMP != 0 +#error armv5+smp not supported +#endif +} diff --git a/vm/compiler/codegen/arm/armv6j/Codegen.c b/vm/compiler/codegen/arm/armv6j/Codegen.c index 5e53ae4e4..3488af4c5 100644 --- a/vm/compiler/codegen/arm/armv6j/Codegen.c +++ b/vm/compiler/codegen/arm/armv6j/Codegen.c @@ -14,10 +14,13 @@ * limitations under the License. */ +#define _CODEGEN_C +#define _ARMV5TE + #include "Dalvik.h" #include "interp/InterpDefs.h" #include "libdex/OpCode.h" -#include "dexdump/OpCodeNames.h" +#include "libdex/OpCodeNames.h" #include "compiler/CompilerInternals.h" #include "compiler/codegen/arm/ArmLIR.h" #include "mterp/common/FindInterface.h" |