From: Brian Carlstrom <bdc@google.com>
Date: Wed, 3 Nov 2010 18:05:53 +0000 (-0700)
Subject: Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
X-Git-Tag: android-x86-4.0-r1~256
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=79a98f9f9c2c67a968c1280e907669e3486aa9c3;p=android-x86%2Fdalvik.git

Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master

Change-Id: I0731a0f623694d15d311dae1450a50e105905421
---

79a98f9f9c2c67a968c1280e907669e3486aa9c3
diff --cc vm/compiler/codegen/arm/armv7-a/Codegen.c
index 1514d55f5,96264920f..dab357961
--- a/vm/compiler/codegen/arm/armv7-a/Codegen.c
+++ b/vm/compiler/codegen/arm/armv7-a/Codegen.c
@@@ -15,6 -15,7 +15,7 @@@
   */
  #define _CODEGEN_C
  #define _ARMV7_A
 -#define TGT_LIR
++#define TGT_LIR ArmLIR
  
  #include "Dalvik.h"
  #include "interp/InterpDefs.h"