OSDN Git Service
Vladimir Marko [Wed, 6 May 2015 23:47:56 +0000 (23:47 +0000)]
am
f986daa2: am
23d358b6: Merge "Quick: Inline synthetic accessors generated by jack."
* commit '
f986daa21a790af412482195137dcc7f50d9d0f3':
Quick: Inline synthetic accessors generated by jack.
Nicolas Geoffray [Wed, 6 May 2015 23:47:53 +0000 (23:47 +0000)]
am
07a13059: am
dceab011: Merge "Bump jdwp timeout to 12 minutes."
* commit '
07a1305927997fa944d4a3f65e45bdbeb16ac916':
Bump jdwp timeout to 12 minutes.
Nicolas Geoffray [Wed, 6 May 2015 23:47:40 +0000 (23:47 +0000)]
am
b1c02d37: am
9cce14f5: Merge "Re-enable JDWP tests on volantis."
* commit '
b1c02d374ba8acab72a35c43b1e2e700ce0de8a3':
Re-enable JDWP tests on volantis.
Sebastien Hertz [Wed, 6 May 2015 23:47:39 +0000 (23:47 +0000)]
am
1b1ca21f: am
644fa22a: Merge "Fix instrumentation exit stub for arm64"
* commit '
1b1ca21fcaff3cd124e3f7a134be5fee57217ba9':
Fix instrumentation exit stub for arm64
Andreas Gampe [Wed, 6 May 2015 22:56:11 +0000 (22:56 +0000)]
am
e92d0afc: am
3acc27f4: Merge "Fix Mips64 utils.h typo"
* commit '
e92d0afc3b1b2bb7f33a94bd491451ba99746c34':
Fix Mips64 utils.h typo
Hiroshi Yamauchi [Wed, 6 May 2015 22:55:40 +0000 (22:55 +0000)]
am
6b87b6bd: am
35b6625c: Merge "Temporarily suppress 098-ddmc for the read barrier config."
* commit '
6b87b6bdff5d04a24a2531ab942b578925078747':
Temporarily suppress 098-ddmc for the read barrier config.
Roland Levillain [Wed, 6 May 2015 22:44:58 +0000 (22:44 +0000)]
am
95072ae7: am
2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""
* commit '
95072ae7446ceaa080c71a7296d98a17325539d8':
Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
Nicolas Geoffray [Wed, 6 May 2015 22:44:51 +0000 (22:44 +0000)]
am
9b9cb18c: am
898fa9b9: Merge "Find better split positions in the register allocator."
* commit '
9b9cb18cfad2b94aa8d353569ccefae139562f5f':
Find better split positions in the register allocator.
Andreas Gampe [Wed, 6 May 2015 22:44:33 +0000 (22:44 +0000)]
am
9820d3c1: am
008b17ae: Merge "ART: Fix double-free in oatdump"
* commit '
9820d3c198abed51b781c25fd4139902fc391e0a':
ART: Fix double-free in oatdump
Vladimir Marko [Wed, 6 May 2015 17:11:39 +0000 (17:11 +0000)]
am
f7083ed8: Quick: Inline synthetic accessors generated by jack.
* commit '
f7083ed806da454ba6a50ddef34799559f863fd4':
Quick: Inline synthetic accessors generated by jack.
Vladimir Marko [Wed, 6 May 2015 13:09:04 +0000 (14:09 +0100)]
Quick: Inline synthetic accessors generated by jack.
While javac names synthetic accessors "access$nnn", jack
names them "-getN", "-putN" and "-wrapN". For simplicity,
treat all methods starting with "-" as synthetic accessors.
Bug:
20873367
(cherry picked from commit
d5f1005da7599f149b1332402c9791ef2acb8c42)
Change-Id: Ifcc77fc3c5dd44797a48632c8e16416fbc273a93
Vladimir Marko [Wed, 6 May 2015 15:27:41 +0000 (15:27 +0000)]
am
23d358b6: Merge "Quick: Inline synthetic accessors generated by jack."
* commit '
23d358b621dbe11d6da918ab310ed3f1a5fc0558':
Quick: Inline synthetic accessors generated by jack.
Vladimir Marko [Wed, 6 May 2015 15:19:23 +0000 (15:19 +0000)]
Merge "Quick: Inline synthetic accessors generated by jack."
Vladimir Marko [Wed, 6 May 2015 13:09:04 +0000 (14:09 +0100)]
Quick: Inline synthetic accessors generated by jack.
While javac names synthetic accessors "access$nnn", jack
names them "-getN", "-putN" and "-wrapN". For simplicity,
treat all methods starting with "-" as synthetic accessors.
Bug:
20873367
Change-Id: I67990a6c2ef1d25dafe460ef70143a113bb5b7da
Nicolas Geoffray [Wed, 6 May 2015 14:08:42 +0000 (14:08 +0000)]
am
dceab011: Merge "Bump jdwp timeout to 12 minutes."
* commit '
dceab011395333520959cf743d680bcf5dc78797':
Bump jdwp timeout to 12 minutes.
Nicolas Geoffray [Wed, 6 May 2015 14:02:23 +0000 (14:02 +0000)]
Merge "Bump jdwp timeout to 12 minutes."
Nicolas Geoffray [Wed, 6 May 2015 13:57:09 +0000 (14:57 +0100)]
Bump jdwp timeout to 12 minutes.
A run on volantis now is around 10 minutes.
Change-Id: I6e1f436d71da6eec55e984f7af99ba34438e49fb
Sebastien Hertz [Wed, 6 May 2015 09:35:06 +0000 (09:35 +0000)]
am
529c147b: Merge "Fix instrumentation exit stub for arm64" into mnc-dev
* commit '
529c147b6ce15fd4ac8b2500c7e7a5749e98396b':
Fix instrumentation exit stub for arm64
Nicolas Geoffray [Wed, 6 May 2015 08:47:43 +0000 (08:47 +0000)]
am
9cce14f5: Merge "Re-enable JDWP tests on volantis."
* commit '
9cce14f56a59bbce52254ffc50ea6817fd94d8dd':
Re-enable JDWP tests on volantis.
Sebastien Hertz [Wed, 6 May 2015 08:47:42 +0000 (08:47 +0000)]
am
644fa22a: Merge "Fix instrumentation exit stub for arm64"
* commit '
644fa22a432ad0f717878331e745d6c25cc57d5d':
Fix instrumentation exit stub for arm64
Nicolas Geoffray [Wed, 6 May 2015 08:23:00 +0000 (08:23 +0000)]
Merge "Re-enable JDWP tests on volantis."
Nicolas Geoffray [Wed, 6 May 2015 08:19:32 +0000 (09:19 +0100)]
Re-enable JDWP tests on volantis.
Change-Id: Ibf1d16c9830155526cee38e242a4de9a3d5ed943
Sebastien Hertz [Wed, 6 May 2015 08:07:06 +0000 (08:07 +0000)]
Merge "Fix instrumentation exit stub for arm64"
Sebastien Hertz [Tue, 5 May 2015 18:03:50 +0000 (20:03 +0200)]
Fix instrumentation exit stub for arm64
Fixes bad offset to restore register x21.
Bug:
20798393
(cherry picked from commit
a538effb3f848bfec232c55f167b9f35b416948f)
Change-Id: I030d848ab0f46043e86f53abae204463f0aaccbe
Sebastien Hertz [Wed, 6 May 2015 08:01:23 +0000 (08:01 +0000)]
Merge "Fix instrumentation exit stub for arm64" into mnc-dev
Andreas Gampe [Wed, 6 May 2015 01:13:15 +0000 (01:13 +0000)]
am
3acc27f4: Merge "Fix Mips64 utils.h typo"
* commit '
3acc27f454e33f4650867a3ba0ecb8d3011e1048':
Fix Mips64 utils.h typo
Andreas Gampe [Wed, 6 May 2015 01:01:27 +0000 (01:01 +0000)]
Merge "Fix Mips64 utils.h typo"
Duane Sand [Tue, 5 May 2015 21:48:43 +0000 (14:48 -0700)]
Fix Mips64 utils.h typo
Include of art's utils.h was mistyped as util.h, and instead
brought in external/icu/icu4c/source/common/util.h,
which caused art build failures from -Wdeprecated warnings
when Mips64 libart is compiled with clang.
Change-Id: I9370c4dc041eaecc5d5a1490ec23034ece4322a9
Hiroshi Yamauchi [Tue, 5 May 2015 22:23:46 +0000 (22:23 +0000)]
am
35b6625c: Merge "Temporarily suppress 098-ddmc for the read barrier config."
* commit '
35b6625c21e9304dd79700f4ff1c26a7e30d2b2d':
Temporarily suppress 098-ddmc for the read barrier config.
Hiroshi Yamauchi [Tue, 5 May 2015 22:13:32 +0000 (22:13 +0000)]
Merge "Temporarily suppress 098-ddmc for the read barrier config."
Hiroshi Yamauchi [Tue, 5 May 2015 20:36:39 +0000 (13:36 -0700)]
Temporarily suppress 098-ddmc for the read barrier config.
Bug:
20720510
Change-Id: Ie8c159767654837c02f0484f4dda569bb0118a03
Hiroshi Yamauchi [Tue, 5 May 2015 19:07:34 +0000 (19:07 +0000)]
am
d117954a: Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()." into mnc-dev
* commit '
d117954a3b10aaf2141beabb12762d68d4b945ba':
Request full/partial GC type from VMRuntime.requestConcurrentGC().
Mathieu Chartier [Tue, 5 May 2015 19:07:33 +0000 (19:07 +0000)]
am
6985da63: am
02d320c2: (-s ours) am
3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
* commit '
6985da634653fd825974bdd89cf488c6dd386fd0':
Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
Sebastien Hertz [Tue, 5 May 2015 18:03:50 +0000 (20:03 +0200)]
Fix instrumentation exit stub for arm64
Fixes bad offset to restore register x21.
Bug:
20798393
Change-Id: I030d848ab0f46043e86f53abae204463f0aaccbe
Hiroshi Yamauchi [Tue, 5 May 2015 17:01:33 +0000 (17:01 +0000)]
Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()." into mnc-dev
Roland Levillain [Tue, 5 May 2015 13:56:39 +0000 (13:56 +0000)]
am
2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""
* commit '
2b689e370be9f32a88b419edf2d78eb6befade9c':
Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
Roland Levillain [Tue, 5 May 2015 13:45:56 +0000 (13:45 +0000)]
Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""
Nicolas Geoffray [Tue, 5 May 2015 09:39:11 +0000 (09:39 +0000)]
am
898fa9b9: Merge "Find better split positions in the register allocator."
* commit '
898fa9b96a579715d124671102886242bd62f393':
Find better split positions in the register allocator.
Nicolas Geoffray [Tue, 5 May 2015 09:26:29 +0000 (09:26 +0000)]
Merge "Find better split positions in the register allocator."
Nicolas Geoffray [Wed, 29 Apr 2015 13:16:00 +0000 (14:16 +0100)]
Find better split positions in the register allocator.
In a standard if/else control flow graph, this avoids
doing a move in one branch if the other branch decided
to move an interval.
This also needs a new register hint kind, which is what
was the location of the interval at the predecessor block.
Change-Id: I18b78264587b4d693540fbb5e014d12df2add3e2
Mathieu Chartier [Tue, 5 May 2015 01:48:09 +0000 (01:48 +0000)]
am
02d320c2: (-s ours) am
3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
* commit '
02d320c218be4b8877d2d6947b1c85120736558c':
Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
Andreas Gampe [Tue, 5 May 2015 01:38:30 +0000 (01:38 +0000)]
am
008b17ae: Merge "ART: Fix double-free in oatdump"
* commit '
008b17ae313d033537a3792faf937134315f03bc':
ART: Fix double-free in oatdump
Andreas Gampe [Tue, 5 May 2015 01:31:33 +0000 (01:31 +0000)]
Merge "ART: Fix double-free in oatdump"
Andreas Gampe [Tue, 5 May 2015 01:25:23 +0000 (18:25 -0700)]
ART: Fix double-free in oatdump
The ImageDumper doesn't own the OatDumperOptions.
Bug:
20818721
Change-Id: Iea11ada8fb6418b226d39b33c252a834c42e655e
Andreas Gampe [Tue, 5 May 2015 01:24:10 +0000 (01:24 +0000)]
am
15c80977: Merge "ART: Emit debug info when app is debuggable" into mnc-dev
* commit '
15c80977a56a788078056f30d456ba75db5b2353':
ART: Emit debug info when app is debuggable
Mathieu Chartier [Tue, 5 May 2015 01:24:09 +0000 (01:24 +0000)]
am
ba52e130: Delete invalid DCHECK
* commit '
ba52e13068f4a04de13e7dd719a758c19b13fad5':
Delete invalid DCHECK
Andreas Gampe [Tue, 5 May 2015 01:22:15 +0000 (01:22 +0000)]
am
5e37e239: am
c2baa5e3: Merge "ART: Emit debug info when app is debuggable"
* commit '
5e37e239a403bba0887cbd9781d215c21b29e56e':
ART: Emit debug info when app is debuggable
Christopher Ferris [Tue, 5 May 2015 01:22:12 +0000 (01:22 +0000)]
am
42b59f6a: am
dd13f157: Merge "Fix mismatched new[]/delete."
* commit '
42b59f6ada0fac613776b4d1f9d3b350c214b572':
Fix mismatched new[]/delete.
Mathieu Chartier [Tue, 5 May 2015 01:22:01 +0000 (01:22 +0000)]
am
9a3fe451: am
d864f501: Merge "Delete invalid DCHECK"
* commit '
9a3fe451d1af1df6a1da18a956fc77d4bc9480e0':
Delete invalid DCHECK
Andreas Gampe [Tue, 5 May 2015 01:02:46 +0000 (01:02 +0000)]
am
c2baa5e3: Merge "ART: Emit debug info when app is debuggable"
* commit '
c2baa5e36f615947affc899b063ceadbd2879d17':
ART: Emit debug info when app is debuggable
Christopher Ferris [Tue, 5 May 2015 01:02:45 +0000 (01:02 +0000)]
am
dd13f157: Merge "Fix mismatched new[]/delete."
* commit '
dd13f1579006f0562a1b3548dc0a6d80cf62a002':
Fix mismatched new[]/delete.
Mathieu Chartier [Tue, 5 May 2015 01:02:42 +0000 (01:02 +0000)]
am
d864f501: Merge "Delete invalid DCHECK"
* commit '
d864f5010de581b15cea1e8178871e658024a6d9':
Delete invalid DCHECK
Mathieu Chartier [Tue, 5 May 2015 01:00:30 +0000 (01:00 +0000)]
am
3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
* commit '
3c683c5d107cb43e8027d740ed579ef92a88af2e':
Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
Andreas Gampe [Mon, 4 May 2015 22:13:05 +0000 (22:13 +0000)]
Merge "ART: Emit debug info when app is debuggable"
Andreas Gampe [Mon, 4 May 2015 15:33:31 +0000 (08:33 -0700)]
ART: Emit debug info when app is debuggable
Emit debug symbols and CFI when dex2oat is compiling with the
--debuggable flag.
Bug:
17011129
(cherry picked from commit
8484d23186c229e2927441f85ae819abb4996072)
Change-Id: I0afab1e46abd819eded2b823580e766619497393
Christopher Ferris [Mon, 4 May 2015 21:58:44 +0000 (21:58 +0000)]
Merge "Fix mismatched new[]/delete."
Andreas Gampe [Mon, 4 May 2015 21:51:31 +0000 (21:51 +0000)]
Merge "ART: Emit debug info when app is debuggable" into mnc-dev
Mathieu Chartier [Mon, 4 May 2015 18:46:25 +0000 (11:46 -0700)]
Delete invalid DCHECK
We can have large objects mapped at address 0xebad____.
(cherry picked from commit
e1a0153eeecbacaa4dbdbd4650f7ba40b9c47814)
Change-Id: I9e27d4948e7e853b4af6eb1b36dbfec6d4d7a99a
Mathieu Chartier [Mon, 4 May 2015 19:59:55 +0000 (19:59 +0000)]
Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
This reverts commit
471b7cb6c1b8128bb343b49198f2654f9f5b8f86.
Change-Id: Ia22615b401fd28ea94e6269f9eac5653e103a6fd
Mathieu Chartier [Mon, 4 May 2015 19:12:45 +0000 (19:12 +0000)]
Merge "Delete invalid DCHECK"
Christopher Ferris [Mon, 27 Apr 2015 22:19:41 +0000 (15:19 -0700)]
Fix mismatched new[]/delete.
Another two cases where a new[] is used but only a delete occurs.
Bug:
18202869
Change-Id: If68264807150f3a9783e44ef8823cc366bff8df2
Mathieu Chartier [Mon, 4 May 2015 18:46:25 +0000 (11:46 -0700)]
Delete invalid DCHECK
We can have large objects mapped at address 0xebad____.
Change-Id: I9e27d4948e7e853b4af6eb1b36dbfec6d4d7a99a
Mathieu Chartier [Mon, 4 May 2015 19:00:17 +0000 (19:00 +0000)]
am
a6ce5b2d: Improve JNI registration failure logging
* commit '
a6ce5b2d5ade23087ab15f26d4c487570ad84b5e':
Improve JNI registration failure logging
Mathieu Chartier [Mon, 4 May 2015 18:44:45 +0000 (18:44 +0000)]
am
1384f29a: am
a93b104b: Merge "Improve JNI registration failure logging"
* commit '
1384f29a2e5c9c7e560f17672f0634fb51451044':
Improve JNI registration failure logging
Mathieu Chartier [Mon, 4 May 2015 18:32:27 +0000 (18:32 +0000)]
am
a93b104b: Merge "Improve JNI registration failure logging"
* commit '
a93b104b47da67eaa50f8a6b7280cc6c438ef37b':
Improve JNI registration failure logging
Mathieu Chartier [Mon, 4 May 2015 17:18:24 +0000 (10:18 -0700)]
Improve JNI registration failure logging
Print INTERNAL_FATAL instead of ERROR, print the
"Failed to register native method" message last.
(cherry picked from commit
5c02d6cd0cc7e10d30d8c26166ebaaf6d313d771)
Bug:
13885477
Change-Id: I9f1a7ea45bd926f3984b8008d84c75e676a1ed10
Mathieu Chartier [Mon, 4 May 2015 18:17:40 +0000 (18:17 +0000)]
Merge "Improve JNI registration failure logging"
Mathieu Chartier [Mon, 4 May 2015 17:18:24 +0000 (10:18 -0700)]
Improve JNI registration failure logging
Print INTERNAL_FATAL instead of ERROR, print the
"Failed to register native method" message last.
Bug:
13885477
Change-Id: I9f1a7ea45bd926f3984b8008d84c75e676a1ed10
Mathieu Chartier [Mon, 4 May 2015 17:37:08 +0000 (17:37 +0000)]
am
46578a4a: Fix NanoSleep and add test
* commit '
46578a4a3bf235fde35ed80c6e6cbe8fb5f06b48':
Fix NanoSleep and add test
Mathieu Chartier [Mon, 4 May 2015 17:30:47 +0000 (17:30 +0000)]
am
b2a62122: am
a6f2a7e0: Merge "Fix NanoSleep and add test"
* commit '
b2a62122e8f512915836a12a703b2567cebddd99':
Fix NanoSleep and add test
Mathieu Chartier [Mon, 4 May 2015 17:25:02 +0000 (17:25 +0000)]
am
414369a2: Add some more DISALLOW_COPY_AND_ASSIGN
* commit '
414369a2e3f23e1408fc1cbf4f623014bd95cb8f':
Add some more DISALLOW_COPY_AND_ASSIGN
Mathieu Chartier [Mon, 4 May 2015 17:18:55 +0000 (17:18 +0000)]
am
a6f2a7e0: Merge "Fix NanoSleep and add test"
* commit '
a6f2a7e01433926339866afc2b413770774c6d9f':
Fix NanoSleep and add test
Mathieu Chartier [Mon, 4 May 2015 17:10:47 +0000 (17:10 +0000)]
Merge "Fix NanoSleep and add test"
Mathieu Chartier [Mon, 4 May 2015 16:53:43 +0000 (09:53 -0700)]
Fix NanoSleep and add test
Fixed a bug where tv_nsec was't between 0 and 999,999,999.
(cherry picked from commit
0b063d9ba7a11779667c0888e9f3495de0118b74)
Bug:
14450052
Change-Id: I30b29a716bfa63c6b57d589dd1102d2ca934c061
Mathieu Chartier [Mon, 4 May 2015 16:53:43 +0000 (09:53 -0700)]
Fix NanoSleep and add test
Fixed a bug where tv_nsec was't between 0 and 999,999,999.
Bug:
14450052
Change-Id: I30b29a716bfa63c6b57d589dd1102d2ca934c061
Mathieu Chartier [Sun, 3 May 2015 22:20:23 +0000 (15:20 -0700)]
Add some more DISALLOW_COPY_AND_ASSIGN
May help prevent bugs maybe.
(cherry picked from commit
3130cdf29eb203be0c38d1107a65d920ec39c106)
Change-Id: Ie73d469dfcd078492ecb3aa28682b42707221202
Andreas Gampe [Mon, 4 May 2015 15:33:31 +0000 (08:33 -0700)]
ART: Emit debug info when app is debuggable
Emit debug symbols and CFI when dex2oat is compiling with the
--debuggable flag.
Bug:
17011129
Change-Id: I0afab1e46abd819eded2b823580e766619497393
Mark P Mendell [Wed, 29 Apr 2015 14:56:17 +0000 (14:56 +0000)]
Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
This reverts commit
2a7a1d7808f003bea908023ebd11eb442d2fca39.
Fix the problem that a long long >> 63 got the wrong answer. The
problem was that a shr was used instead of a sar.
Change-Id: I0327f79c718016ddec9272a605fc50ec15ec4566
Mathieu Chartier [Sun, 3 May 2015 22:40:56 +0000 (22:40 +0000)]
am
25919277: am
8a30bf23: Merge "Add some more DISALLOW_COPY_AND_ASSIGN"
* commit '
2591927761cbec8665a38d23980e36037d08ee07':
Add some more DISALLOW_COPY_AND_ASSIGN
Mathieu Chartier [Sun, 3 May 2015 22:33:05 +0000 (22:33 +0000)]
am
8a30bf23: Merge "Add some more DISALLOW_COPY_AND_ASSIGN"
* commit '
8a30bf23bcb1ad8d4ed9060ddbb27edbfd57a897':
Add some more DISALLOW_COPY_AND_ASSIGN
Mathieu Chartier [Sun, 3 May 2015 22:26:22 +0000 (22:26 +0000)]
Merge "Add some more DISALLOW_COPY_AND_ASSIGN"
Mathieu Chartier [Sun, 3 May 2015 22:20:23 +0000 (15:20 -0700)]
Add some more DISALLOW_COPY_AND_ASSIGN
May help prevent bugs maybe.
Change-Id: Ie73d469dfcd078492ecb3aa28682b42707221202
Hiroshi Yamauchi [Sat, 2 May 2015 00:53:32 +0000 (17:53 -0700)]
Request full/partial GC type from VMRuntime.requestConcurrentGC().
(cherry pick commit
0ae98992d348b5bf3fc85a52d81b0e5f221f20d6)
Bug:
20554807
Change-Id: I572e846e9d0347b8b2692442e55f56c08b07d395
Christopher Ferris [Sat, 2 May 2015 00:46:06 +0000 (00:46 +0000)]
am
d718236c: am
25dcb259: Merge "Let the map function compute the relative pc."
* commit '
d718236cc45ec761bb72c894343d91645fe1fa92':
Let the map function compute the relative pc.
Christopher Ferris [Sat, 2 May 2015 00:31:01 +0000 (00:31 +0000)]
am
6f1be449: Merge "Let the map function compute the relative pc." into mnc-dev
* commit '
6f1be4493a558e8dabdc981b37852a2008f7bef1':
Let the map function compute the relative pc.
Christopher Ferris [Sat, 2 May 2015 00:29:42 +0000 (00:29 +0000)]
am
25dcb259: Merge "Let the map function compute the relative pc."
* commit '
25dcb2594a21a565ef82faa66a79bcf595c3a780':
Let the map function compute the relative pc.
Christopher Ferris [Sat, 2 May 2015 00:20:15 +0000 (00:20 +0000)]
Merge "Let the map function compute the relative pc."
Christopher Ferris [Fri, 1 May 2015 23:03:49 +0000 (16:03 -0700)]
Let the map function compute the relative pc.
The new packed relocations linker option creates an elf with a non-zero
load base. It's no longer an easy task to compute the relative pc yourself
so call the helper function to do it for us.
Bug:
20687795
(cherry picked from commit
332ef327c2b1a5e1774ba0d1da23e07303002af9)
Change-Id: I3d61c767f21a3f240a14f9e8bc6bee53b6cdb60d
Christopher Ferris [Sat, 2 May 2015 00:07:16 +0000 (00:07 +0000)]
Merge "Let the map function compute the relative pc." into mnc-dev
Hiroshi Yamauchi [Fri, 1 May 2015 23:45:53 +0000 (23:45 +0000)]
am
5b19928e: am
43e1bc66: Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()."
* commit '
5b19928e7adc9749e3d4c306c5955ee14f76717c':
Request full/partial GC type from VMRuntime.requestConcurrentGC().
Hiroshi Yamauchi [Fri, 1 May 2015 23:34:11 +0000 (23:34 +0000)]
am
43e1bc66: Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()."
* commit '
43e1bc667e66386443aee6477d767d9b8ef5aa79':
Request full/partial GC type from VMRuntime.requestConcurrentGC().
Andreas Gampe [Fri, 1 May 2015 23:34:09 +0000 (23:34 +0000)]
am
b60cae5a: am
376d941d: Merge "ART: Fix max build"
* commit '
b60cae5a2e02b025201bb9db1bb7487e1f7992f2':
ART: Fix max build
Christopher Ferris [Fri, 1 May 2015 23:03:49 +0000 (16:03 -0700)]
Let the map function compute the relative pc.
The new packed relocations linker option creates an elf with a non-zero
load base. It's no longer an easy task to compute the relative pc yourself
so call the helper function to do it for us.
Bug:
20687795
Change-Id: If11c1a596bc79382d44e35a86d5035ab29d29864
Hiroshi Yamauchi [Fri, 1 May 2015 23:22:51 +0000 (23:22 +0000)]
Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()."
Andreas Gampe [Fri, 1 May 2015 23:21:12 +0000 (23:21 +0000)]
am
376d941d: Merge "ART: Fix max build"
* commit '
376d941d5d8ad23ca2880aecffbe8381be963f35':
ART: Fix max build
Andreas Gampe [Fri, 1 May 2015 23:13:38 +0000 (23:13 +0000)]
Merge "ART: Fix max build"
Andreas Gampe [Fri, 1 May 2015 23:11:04 +0000 (16:11 -0700)]
ART: Fix max build
Change-Id: Id1b9c0ee05b61195d1c1f09a8938df3110c2f2b3
Chih-hung Hsieh [Fri, 1 May 2015 22:53:06 +0000 (22:53 +0000)]
am
cb2e4125: am
b0d9f0dd: Merge "Re-enable clang for Mips/Mips64 targets."
* commit '
cb2e41257a8b0244aef72241d0af3226a348b88c':
Re-enable clang for Mips/Mips64 targets.
Chih-hung Hsieh [Fri, 1 May 2015 22:40:58 +0000 (22:40 +0000)]
am
b0d9f0dd: Merge "Re-enable clang for Mips/Mips64 targets."
* commit '
b0d9f0ddd6189564f359f989d9ff606d6c691ed0':
Re-enable clang for Mips/Mips64 targets.
Chih-hung Hsieh [Fri, 1 May 2015 22:30:07 +0000 (22:30 +0000)]
Merge "Re-enable clang for Mips/Mips64 targets."