Nick Kralevich
e88b00c51d
am a6eef3be: Merge "Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions""
...
* commit 'a6eef3be105fb34161fd1b1d513f7d03b5f1bbe9':
Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 00:44:49 +00:00
Nick Kralevich
0fd98ec4d7
am a6eef3be: Merge "Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions""
...
* commit 'a6eef3be105fb34161fd1b1d513f7d03b5f1bbe9':
Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 00:44:49 +00:00
Nick Kralevich
a6eef3be10
Merge "Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions""
2014-10-06 00:40:07 +00:00
Nick Kralevich
884a3de60f
Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
Broke the build.
In file included from frameworks/rs/cpu_ref/rsCpuCore.cpp:36:
system/core/include/cutils/properties.h:118:1: error: unknown attribute '__artificial__' ignored [-Werror,-Wunknown-attributes]
__BIONIC_FORTIFY_INLINE
^
bionic/libc/include/sys/cdefs.h:537:110: note: expanded from macro '__BIONIC_FORTIFY_INLINE'
#define __BIONIC_FORTIFY_INLINE extern __inline__ __always_inline __attribute__((gnu_inline)) __attribute__((__artificial__))
^
1 error generated.
make: *** [out/target/product/generic/obj/SHARED_LIBRARIES/libRSCpuRef_intermediates/rsCpuCore.o] Error 1
This reverts commit 9b543ffeac216189cc8125f7624da9a8cbcbe2e4.
Change-Id: I6a1198747505dcb402b722887c1bfbc3a628a8b8
2014-10-06 00:39:47 +00:00
Nick Kralevich
036cd686af
am 558ec810: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit '558ec8103bad6eed78c3e372fc9b2535a3486745':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-06 00:17:24 +00:00
Nick Kralevich
5ba8094f8b
am 558ec810: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit '558ec8103bad6eed78c3e372fc9b2535a3486745':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-06 00:17:23 +00:00
Nick Kralevich
558ec8103b
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 00:10:48 +00:00
Nick Kralevich
32cfbb7605
am db6fea86: Merge "further cleanup memcpy fortify implementation"
...
* commit 'db6fea86a5cb70c5aaad61ef6c126557f36e138b':
further cleanup memcpy fortify implementation
2014-10-05 16:54:37 +00:00
Nick Kralevich
10450b14f7
am db6fea86: Merge "further cleanup memcpy fortify implementation"
...
* commit 'db6fea86a5cb70c5aaad61ef6c126557f36e138b':
further cleanup memcpy fortify implementation
2014-10-05 16:52:37 +00:00
Nick Kralevich
db6fea86a5
Merge "further cleanup memcpy fortify implementation"
2014-10-05 16:43:24 +00:00
Nick Kralevich
b84f667e93
further cleanup memcpy fortify implementation
...
Change-Id: I0380f3c8ca8f9bb8a206accd839c32c9daf13c56
2014-10-05 06:52:24 -07:00
Nick Kralevich
9b543ffeac
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
...
Otherwise the gcc compiler warning doesn't show up.
Delete some unittests. These unittests no longer compile cleanly
using -Wall -Werror, and rewriting them to compile cleanly
isn't feasible.
Bug: 17784968
Change-Id: I9bbdc7b6a1c2ac75754f5d0f90782e0dfae66721
2014-10-04 22:01:41 -07:00
Nick Kralevich
2b208d96af
am ae97a776: Merge "string.h: remove unused variable"
...
* commit 'ae97a776ea900e5923d6d320d72dcc04b224796e':
string.h: remove unused variable
2014-10-04 22:47:10 +00:00
Nick Kralevich
b93a965bce
am ae97a776: Merge "string.h: remove unused variable"
...
* commit 'ae97a776ea900e5923d6d320d72dcc04b224796e':
string.h: remove unused variable
2014-10-04 22:47:07 +00:00
Nick Kralevich
ae97a776ea
Merge "string.h: remove unused variable"
2014-10-04 22:38:09 +00:00
Nick Kralevich
48be71d02b
string.h: remove unused variable
...
Change-Id: I08b7dab1b374ad427fcbee4183f2c7d93d0199a9
2014-10-04 15:20:00 -07:00
Dmitriy Ivanov
cd9165e649
resolved conflicts for merge of 02542b3b to lmp-mr1-dev-plus-aosp
...
Change-Id: Ib881abd163fd737719b665c447055c7883a7b791
2014-10-04 11:16:42 -07:00
Elliott Hughes
2e345351b3
resolved conflicts for merge of a5087148 to lmp-dev-plus-aosp
...
Change-Id: Ic6b352650a7dec53cdd681d0f0b8ba4278e560d3
2014-10-04 10:03:08 -07:00
Alex Van Brunt
02542b3bbd
am a5087148: Reimplement clock(3) using clock_gettime(3)
...
* commit 'a508714800242b294291060641ed35d719bdc857':
Reimplement clock(3) using clock_gettime(3)
2014-10-04 16:44:11 +00:00
Elliott Hughes
b4954dc384
am 4ef0e59f: Merge "Reimplement clock(3) using clock_gettime(3)"
...
* commit '4ef0e59f339ad138eabe3bc408beda6004f5ea83':
Reimplement clock(3) using clock_gettime(3)
2014-10-04 02:24:08 +00:00
Elliott Hughes
5f86872e67
am 4ef0e59f: Merge "Reimplement clock(3) using clock_gettime(3)"
...
* commit '4ef0e59f339ad138eabe3bc408beda6004f5ea83':
Reimplement clock(3) using clock_gettime(3)
2014-10-04 02:17:19 +00:00
Alex Van Brunt
a508714800
Reimplement clock(3) using clock_gettime(3)
...
Unlike times(), clock_gettime() is implemented as a vDSO on many architectures.
So, using clock_gettime() will return a more accurate time and do so with less
overhead because it does have the overhead of calling into the kernel.
It is also significantly more accurate because it measures the actual time in
nanoseconds rather than the number of ticks (typically 1 millisecond or more).
Bug: 17814435
(cherry picked from commit 8d0b2dbf2154d5da17ff09b1d4f864d281362ad2)
Change-Id: Id4945d9f387330518f78669809639952e9227ed9
2014-10-03 19:05:52 -07:00
Elliott Hughes
4ef0e59f33
Merge "Reimplement clock(3) using clock_gettime(3)"
2014-10-04 01:57:42 +00:00
Alex Van Brunt
8d0b2dbf21
Reimplement clock(3) using clock_gettime(3)
...
Unlike times(), clock_gettime() is implemented as a vDSO on many architectures.
So, using clock_gettime() will return a more accurate time and do so with less
overhead because it does have the overhead of calling into the kernel.
It is also significantly more accurate because it measures the actual time in
nanoseconds rather than the number of ticks (typically 1 millisecond or more).
Bug: 17814435
Change-Id: Id4945d9f387330518f78669809639952e9227ed9
2014-10-03 18:54:28 -07:00
Elliott Hughes
22f5a61d95
am ea9800e9: Explain why clock(3) isn\'t broken.
...
* commit 'ea9800e98598c71fe76c4e2a0d0498b6bd490a83':
Explain why clock(3) isn't broken.
2014-10-04 00:06:27 +00:00
Elliott Hughes
f4555a003b
am ea9800e9: Explain why clock(3) isn\'t broken.
...
* commit 'ea9800e98598c71fe76c4e2a0d0498b6bd490a83':
Explain why clock(3) isn't broken.
2014-10-03 23:57:39 +00:00
Elliott Hughes
ea9800e985
Explain why clock(3) isn't broken.
...
Bug: 17441123
Bug: 17814435
(cherry picked from commit f83c208b82c78dad07f4065f63bdd354f5ef9951)
Change-Id: I2065afe73b79a8d86404edee16e983625d902cdc
2014-10-03 16:46:20 -07:00
Dmitriy Ivanov
bf956e863e
resolved conflicts for merge of 04f5f410 to lmp-mr1-dev-plus-aosp
...
Change-Id: I921c62dbe265b1be4d373d1988951de0f6743fba
2014-10-03 12:21:57 -07:00
Dmitriy Ivanov
fc046eca0b
am d5df4124: Merge "Add RTLD_NODELETE flag support"
...
* commit 'd5df4124bbbb30411ef19f7c2fbb3987d0eb9630':
Add RTLD_NODELETE flag support
2014-10-03 16:53:33 +00:00
Dmitriy Ivanov
dcca3fce3f
am d5df4124: Merge "Add RTLD_NODELETE flag support"
...
* commit 'd5df4124bbbb30411ef19f7c2fbb3987d0eb9630':
Add RTLD_NODELETE flag support
2014-10-03 16:47:05 +00:00
Ningsheng Jian
04f5f4100c
Fix gdb could not get shared library list issue
...
Get dynamic flags from phdr table's correct entry rather the first
entry, so that the following DT_DEBUG entry can be set.
Also fix the undefined reference to LoadTask::deleter issue under gcc
-O0 option.
Bug: 17524778
(cherry picked from commit e93be99da0614ff38cbf8b2bb0624ff1dc79b8d0)
Change-Id: I347792dab25c7b19c3fc690e03d20899ce1e26e0
2014-10-02 15:35:47 -07:00
Dmitriy Ivanov
d5df4124bb
Merge "Add RTLD_NODELETE flag support"
2014-10-02 21:47:29 +00:00
Dmitriy Ivanov
bbf86e6157
Fixes to linker code after the conflict resolution
...
Change-Id: Icd0728604a865b73e7af0e0aee38971a612935f2
2014-10-02 13:44:20 -07:00
Dmitriy Ivanov
2cd77d301f
Undo the bad work of Automerger
...
Change-Id: I585388aebc556a094db4c22e647edacea7cde129
2014-10-02 13:08:39 -07:00
Dmitriy Ivanov
145372b1bc
Revert "L-MR1 specific fixes"
...
This reverts commit 1cd0c6777f35b531c9ce78397d0915aa521b3e87.
2014-10-02 12:49:42 -07:00
Dmitriy Ivanov
d4ab8f0135
am 1cd0c677: L-MR1 specific fixes
...
* commit '1cd0c6777f35b531c9ce78397d0915aa521b3e87':
L-MR1 specific fixes
2014-10-02 19:41:50 +00:00
Dmitriy Ivanov
feaf85e34c
resolved conflicts for merge of 7d971ec1 to lmp-mr1-dev-plus-aosp
...
Change-Id: I1cd01e5c0dd00cd55594654d53f7e0cb6edf35d9
2014-10-02 12:38:54 -07:00
Dmitriy Ivanov
b5626827c9
resolved conflicts for merge of f4cb6313 to lmp-mr1-dev-plus-aosp
...
Change-Id: I9c033fa82c7bf07e06157227f5162d603804b7d6
2014-10-02 12:33:10 -07:00
Dmitriy Ivanov
85fc61d7d2
am ef1306d7: Refactoring: C++11 style DISABLE_ bionic marcos
...
* commit 'ef1306d77718cc74a8df5673a15649dea317571d':
Refactoring: C++11 style DISABLE_ bionic marcos
2014-10-02 19:23:57 +00:00
Dmitriy Ivanov
2fbf6593ae
resolved conflicts for merge of 61c4147f to lmp-mr1-dev-plus-aosp
...
Change-Id: I4ed15dbb2136a1984f7651dcc85d05e3e585ac51
2014-10-02 12:22:07 -07:00
Dmitriy Ivanov
6aac3cd112
resolved conflicts for merge of ae69a958 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ia466577ef6e627cc6fcef46aa37cce21acbc8519
2014-10-02 12:17:32 -07:00
Dmitriy Ivanov
e3105fee22
resolved conflicts for merge of c0133a73 to lmp-mr1-dev-plus-aosp
...
Change-Id: I31d81e91d796fa27f9c88a7edc96c97320ade72c
2014-10-02 11:59:28 -07:00
Dmitriy Ivanov
daf15a6ca7
resolved conflicts for merge of 8de1ddec to lmp-mr1-dev-plus-aosp
...
Change-Id: I9bb063dcf684307181ce4a2b1e5f96bd0d78aaff
2014-10-02 11:34:05 -07:00
Dmitriy Ivanov
32ebc71f99
resolved conflicts for merge of 59c12a65 to lmp-mr1-dev-plus-aosp
...
Change-Id: I92667dd3d55c8cfd2586c88362fd542c7a6ff9b2
2014-10-02 11:27:57 -07:00
Dmitriy Ivanov
dadc782cf0
resolved conflicts for merge of 81fe2b16 to lmp-mr1-dev-plus-aosp
...
Change-Id: I61272d86ebf0d40262e88f5f4327cf97be035bda
2014-10-02 11:06:05 -07:00
Dmitriy Ivanov
9b6b6e6d4a
resolved conflicts for merge of 7210c41f to lmp-mr1-dev-plus-aosp
...
Change-Id: I44d84a95f506e89e77cce8c218083a80ca5724b9
2014-10-02 10:54:08 -07:00
Dmitriy Ivanov
1c69516677
am 4466bd72: Implement LinkedList::visit()
...
* commit '4466bd72fb9daeb0ef8f250e8314b555aab30817':
Implement LinkedList::visit()
2014-10-02 17:34:40 +00:00
Dmitriy Ivanov
de1943eb82
resolved conflicts for merge of ff01f6fc to lmp-mr1-dev-plus-aosp
...
Change-Id: I90e7700708a305a7e93dd3ef3a32c5508038b53b
2014-10-02 10:33:04 -07:00
Dmitriy Ivanov
846be3ea5d
resolved conflicts for merge of 4d01d08c to lmp-mr1-dev-plus-aosp
...
Change-Id: Icaf503240281596de05ee331457200b61d57ab46
2014-10-02 10:28:43 -07:00
Dmitriy Ivanov
cd7890ba2d
resolved conflicts for merge of cfad7ae9 to lmp-mr1-dev-plus-aosp
...
Change-Id: I119e37c6689c4cc49663748a72c17dc55a362b02
2014-10-02 10:21:34 -07:00