OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
79544e5
a52eb22
)
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
author
Brian Carlstrom
<bdc@google.com>
Wed, 3 Nov 2010 18:05:53 +0000
(11:05 -0700)
committer
Brian Carlstrom
<bdc@google.com>
Wed, 3 Nov 2010 22:16:44 +0000
(15:16 -0700)
Change-Id: I0731a0f623694d15d311dae1450a50e105905421
1
2
vm/compiler/codegen/arm/armv7-a/Codegen.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
vm/compiler/codegen/arm/armv7-a/Codegen.c
index
1514d55
,
9626492
..
dab3579
---
1
/
vm/compiler/codegen/arm/armv7-a/Codegen.c
---
2
/
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"