Dmitriy Ivanov
77784cb9b7
Merge "Add Android*.mk files to additional dependencies"
2014-09-17 23:01:49 +00:00
Dmitriy Ivanov
bf50e2645d
Add Android*.mk files to additional dependencies
...
Bug: 17548097
Change-Id: Ie0d9c8f33459320008f561217c54eba42d283b47
2014-09-17 15:55:01 -07:00
Elliott Hughes
b7fb8b6156
am 58fe4f0b: am 03fef1f5: Merge "Fix some 32-bit-isms in <stdio.h>."
...
* commit '58fe4f0b079d780f25f1c34a758550368024a44d':
Fix some 32-bit-isms in <stdio.h>.
2014-09-17 22:53:12 +00:00
Elliott Hughes
3fa99dd4f3
am d75695d8: am 2f5cf100: Merge "Pull input.h from v3.16.1 kernel headers."
...
* commit 'd75695d8e0093ddf1ad298ef6aacae0782816962':
Pull input.h from v3.16.1 kernel headers.
2014-09-17 22:53:11 +00:00
Elliott Hughes
58fe4f0b07
am 03fef1f5: Merge "Fix some 32-bit-isms in <stdio.h>."
...
* commit '03fef1f51179de5cb65eafd9b57ea05c8e061542':
Fix some 32-bit-isms in <stdio.h>.
2014-09-17 22:37:18 +00:00
Elliott Hughes
d75695d8e0
am 2f5cf100: Merge "Pull input.h from v3.16.1 kernel headers."
...
* commit '2f5cf100a8cfaf51296fda69d31ef9e59c6d1da3':
Pull input.h from v3.16.1 kernel headers.
2014-09-17 22:37:17 +00:00
Elliott Hughes
a9a920d52a
am 03fef1f5: Merge "Fix some 32-bit-isms in <stdio.h>."
...
* commit '03fef1f51179de5cb65eafd9b57ea05c8e061542':
Fix some 32-bit-isms in <stdio.h>.
2014-09-17 22:37:09 +00:00
Elliott Hughes
de3b2bfe11
am 2f5cf100: Merge "Pull input.h from v3.16.1 kernel headers."
...
* commit '2f5cf100a8cfaf51296fda69d31ef9e59c6d1da3':
Pull input.h from v3.16.1 kernel headers.
2014-09-17 22:37:08 +00:00
Elliott Hughes
a7c448810d
am 8fa377eb: Fix an unintended difference between aosp/master and lmp-dev-plus-aosp.
...
* commit '8fa377eb6afdea4b03b6a0d112471f7ee988fb96':
Fix an unintended difference between aosp/master and lmp-dev-plus-aosp.
2014-09-17 22:36:10 +00:00
Elliott Hughes
8fa377eb6a
Fix an unintended difference between aosp/master and lmp-dev-plus-aosp.
...
Whitespace difference presumably introduced while fixing a merge conflict.
Bug: 17549448
Change-Id: If688330bf1dbaed23ba687d843d9744d6261023b
2014-09-17 15:25:35 -07:00
Elliott Hughes
03fef1f511
Merge "Fix some 32-bit-isms in <stdio.h>."
2014-09-17 22:22:32 +00:00
Elliott Hughes
2ad11a96a1
Fix some 32-bit-isms in <stdio.h>.
...
(cherry-pick of 2d80400a9e8454038a3ec29959436184be0c4c65.)
Bug: 17157793
Change-Id: I8290e240b92e5617f4c12c0eacad6e622e677b6a
2014-09-17 15:21:10 -07:00
Elliott Hughes
1f82cf40bb
am 21ce3f50: More cases where libc should use O_CLOEXEC.
...
* commit '21ce3f506f3b54e4f57a37847375cef9f8aff57f':
More cases where libc should use O_CLOEXEC.
2014-09-17 22:19:00 +00:00
Dan Albert
23b8947da5
am ebb6b4a4: Hide ScopedTrace.
...
* commit 'ebb6b4a4d3fab87800b912c9d6ea917f5359f8af':
Hide ScopedTrace.
2014-09-17 22:19:00 +00:00
Elliott Hughes
2f5cf100a8
Merge "Pull input.h from v3.16.1 kernel headers."
2014-09-17 22:18:48 +00:00
Christopher Ferris
e2d86feb7b
Pull input.h from v3.16.1 kernel headers.
...
(cherry-pick of 027d2717d067c3706f22bf84dc1226ede7c1566d.)
Bug: 17407564
Change-Id: Idcfc40a7254605280e3d5474c61ae1ab7b2b7b51
2014-09-17 15:18:21 -07:00
Elliott Hughes
21ce3f506f
More cases where libc should use O_CLOEXEC.
...
Change-Id: Idfa111aeebc5deca2399dae919e8b72eb54c23c0
(cherry picked from commit f73183f1a34df22b62a3d0bbf82e18d5797c9cde)
2014-09-17 15:13:35 -07:00
Elliott Hughes
b391e05a25
am 9e87f2f8: Revert "Revert "Added a bionic systrace class and tracing to pthread_mutex.cpp.""
...
* commit '9e87f2f876243225deef37645ddceaa5d225cb41':
Revert "Revert "Added a bionic systrace class and tracing to pthread_mutex.cpp.""
2014-09-17 22:13:23 +00:00
Dan Albert
ebb6b4a4d3
Hide ScopedTrace.
...
(cherry-pick of f2c1e7ee78a167ff323b9f45d20532d064d6778d.)
Bug: 11156955
Change-Id: I6cddc868d1c6503e30f1ffcf460f45670631d64a
2014-09-17 15:11:25 -07:00
Elliott Hughes
9e87f2f876
Revert "Revert "Added a bionic systrace class and tracing to pthread_mutex.cpp.""
...
This reverts commit 26c1420fbb68916d66a8621b5efe8bb25cfdad7b.
2014-09-17 14:59:24 -07:00
Dan Albert
3ec67de051
Exclude libstdc++ from linked libraries.
...
Also explicitly add libstdc++ includes for necessary targets.
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
2014-09-17 14:22:36 -07:00
Elliott Hughes
7eb56f8031
am 39f46864: am 36a5aa05: Merge "Use the kernel\'s sa_restorer for aarch64."
...
* commit '39f4686461889c2a733caf3ea55bb11719ca9036':
Use the kernel's sa_restorer for aarch64.
2014-09-17 17:24:31 +00:00
Elliott Hughes
18ce8e5d03
am 36a5aa05: Merge "Use the kernel\'s sa_restorer for aarch64."
...
* commit '36a5aa057cf1738577754a3fc16a14a5f817109f':
Use the kernel's sa_restorer for aarch64.
2014-09-17 17:17:26 +00:00
Elliott Hughes
39f4686461
am 36a5aa05: Merge "Use the kernel\'s sa_restorer for aarch64."
...
* commit '36a5aa057cf1738577754a3fc16a14a5f817109f':
Use the kernel's sa_restorer for aarch64.
2014-09-17 17:17:14 +00:00
Elliott Hughes
5aeb5f7b11
am 0bbd77af: am 56433ee2: Merge "Clean up the architecture-specific makefiles."
...
* commit '0bbd77af89efdd66e7e265284044ca5894f056be':
Clean up the architecture-specific makefiles.
2014-09-17 17:11:46 +00:00
Elliott Hughes
36a5aa057c
Merge "Use the kernel's sa_restorer for aarch64."
2014-09-17 17:04:40 +00:00
Elliott Hughes
0bbd77af89
am 56433ee2: Merge "Clean up the architecture-specific makefiles."
...
* commit '56433ee2a2ccc097ac3ad753168722b0fc76f3b1':
Clean up the architecture-specific makefiles.
2014-09-17 17:00:39 +00:00
Elliott Hughes
289dd568be
am 56433ee2: Merge "Clean up the architecture-specific makefiles."
...
* commit '56433ee2a2ccc097ac3ad753168722b0fc76f3b1':
Clean up the architecture-specific makefiles.
2014-09-17 17:00:22 +00:00
Elliott Hughes
56433ee2a2
Merge "Clean up the architecture-specific makefiles."
2014-09-17 16:36:47 +00:00
Dmitriy Ivanov
578b8dd727
am b5f0464d: am e7c9a387: Merge "Fix 64bit build"
...
* commit 'b5f0464d825ee1ef80e8652a12b0743433020ab4':
Fix 64bit build
2014-09-17 07:05:51 +00:00
Dmitriy Ivanov
b5f0464d82
am e7c9a387: Merge "Fix 64bit build"
...
* commit 'e7c9a387fa190b786b1f7becfe99cb22a6f2934a':
Fix 64bit build
2014-09-17 06:53:52 +00:00
Dmitriy Ivanov
415658c922
am e7c9a387: Merge "Fix 64bit build"
...
* commit 'e7c9a387fa190b786b1f7becfe99cb22a6f2934a':
Fix 64bit build
2014-09-17 06:53:24 +00:00
Dmitriy Ivanov
e7c9a387fa
Merge "Fix 64bit build"
2014-09-17 06:36:19 +00:00
Dmitriy Ivanov
f240aa8089
Fix 64bit build
...
Change-Id: I6ef55b5951270c46ee5e9a11385bd09e33a9f969
2014-09-16 23:34:20 -07:00
Dmitriy Ivanov
cdd93e0885
am f5a56f21: am 34ac60ca: Merge "Fix some unused DT_ warnings"
...
* commit 'f5a56f21806a3535d3e32b172b417bb4cedf00f5':
Fix some unused DT_ warnings
2014-09-17 06:01:55 +00:00
Dmitriy Ivanov
ab1b06a87b
am 34ac60ca: Merge "Fix some unused DT_ warnings"
...
* commit '34ac60ca16713be227844798f4b20a2f68c8a241':
Fix some unused DT_ warnings
2014-09-17 05:50:49 +00:00
Dmitriy Ivanov
f5a56f2180
am 34ac60ca: Merge "Fix some unused DT_ warnings"
...
* commit '34ac60ca16713be227844798f4b20a2f68c8a241':
Fix some unused DT_ warnings
2014-09-17 05:49:55 +00:00
Dmitriy Ivanov
34ac60ca16
Merge "Fix some unused DT_ warnings"
2014-09-17 05:28:30 +00:00
Elliott Hughes
7c02d9428c
Clean up the architecture-specific makefiles.
...
Group things appropriately and name each group.
Change-Id: I0da45eb0ccde19c31d5e984d0e6eb3dad26630dc
2014-09-16 19:06:31 -07:00
Dmitriy Ivanov
4a6e9a835a
Fix some unused DT_ warnings
...
* DT_PLTGOT - ignored for non-mips
* DT_RELCOUNT/RELACOUNT - ignored
* DT_RELENT/RELAENT - sanity checks
* DT_SYMENT - sanity check
* DT_SONAME - ignore for now.
Change-Id: Ied90748d12f733a84f6c38a1250567a2f77608b7
2014-09-16 18:19:36 -07:00
Elliott Hughes
8b7cb0560f
am 894f7f58: am 17cc8e53: Merge "No arm source refers to SOFTFLOAT."
...
* commit '894f7f5819e9447d7a7418f180c2275c4c7d9f2f':
No arm source refers to SOFTFLOAT.
2014-09-17 00:25:04 +00:00
Elliott Hughes
894f7f5819
am 17cc8e53: Merge "No arm source refers to SOFTFLOAT."
...
* commit '17cc8e539a578184662c1966a60f37c7d4fed65e':
No arm source refers to SOFTFLOAT.
2014-09-17 00:07:22 +00:00
Elliott Hughes
6bf74ba536
am 17cc8e53: Merge "No arm source refers to SOFTFLOAT."
...
* commit '17cc8e539a578184662c1966a60f37c7d4fed65e':
No arm source refers to SOFTFLOAT.
2014-09-17 00:07:11 +00:00
Elliott Hughes
17cc8e539a
Merge "No arm source refers to SOFTFLOAT."
2014-09-16 23:45:40 +00:00
Elliott Hughes
b1a6c319c4
No arm source refers to SOFTFLOAT.
...
So why bother #defining it?
Change-Id: I539e91916cee082cacac594ddf628419b737fa9d
2014-09-16 16:27:35 -07:00
Dmitriy Ivanov
dc428a17d6
am 7ccb499c: am aea393c0: Merge "Remove has_DT_SYMBOLIC flag"
...
* commit '7ccb499c63931b0863d2792f3d2548acca78c90a':
Remove has_DT_SYMBOLIC flag
2014-09-16 23:07:04 +00:00
Dmitriy Ivanov
7ccb499c63
am aea393c0: Merge "Remove has_DT_SYMBOLIC flag"
...
* commit 'aea393c096460669647acbe803617affc5bc0697':
Remove has_DT_SYMBOLIC flag
2014-09-16 22:54:00 +00:00
Dmitriy Ivanov
29be5408dd
am aea393c0: Merge "Remove has_DT_SYMBOLIC flag"
...
* commit 'aea393c096460669647acbe803617affc5bc0697':
Remove has_DT_SYMBOLIC flag
2014-09-16 22:53:57 +00:00
Elliott Hughes
1cff9a8964
Use the kernel's sa_restorer for aarch64.
...
gdb was happy with what we had, but libgcc and libunwind weren't.
libgcc is happy with the kernel's restorer (because of the extra nop),
though libunwind looks like it's going to need code changes regardless.
We could make our restorer more like the kernel's one, but why bother
when we can just let the kernel supply the canonical one?
Bug: 17436734
Change-Id: I330fa5e68f23b1cf8133aa552896657b0b873ed3
2014-09-16 15:49:50 -07:00
Dmitriy Ivanov
aea393c096
Merge "Remove has_DT_SYMBOLIC flag"
2014-09-16 22:37:37 +00:00