Dmitriy Ivanov
6d569b9201
Merge "Add file_offset parameter to android_extinfo"
2014-10-06 17:19:39 +00:00
Dmitriy Ivanov
07e5bc152d
Add file_offset parameter to android_extinfo
...
Bug: 17762003
Change-Id: I8fb267a3155acef3dba534038cf5d1ef00d7154b
2014-10-06 10:02:34 -07: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
558ec8103b
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 00:10:48 +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
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
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
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
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
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
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
d5df4124bb
Merge "Add RTLD_NODELETE flag support"
2014-10-02 21:47:29 +00:00
Hans Boehm
f26a55e13a
am 2d111d9e: Merge "Make memory_order_acquire visible in global namespace"
...
* commit '2d111d9eb10b6c48e2e47251be66b418a6109dd9':
Make memory_order_acquire visible in global namespace
2014-10-01 19:23:05 +00:00
Hans Boehm
2d111d9eb1
Merge "Make memory_order_acquire visible in global namespace"
2014-10-01 19:16:50 +00:00
Christopher Ferris
3a25cdfd33
am b19bd93f: Merge "Add stpcpy assembler version."
...
* commit 'b19bd93f8b83307f2f7530545f7c78824914f4eb':
Add stpcpy assembler version.
2014-10-01 18:24:16 +00:00
Christopher Ferris
b19bd93f8b
Merge "Add stpcpy assembler version."
2014-10-01 18:16:14 +00:00
Dmitriy Ivanov
1b20dafdbe
Add RTLD_NODELETE flag support
...
Bug: https://code.google.com/p/android/issues/detail?id=64069
Change-Id: Ie5f90482feae86391172be4b32d6cb7d76f446fb
2014-10-01 11:09:37 -07:00
Elliott Hughes
1f84254edb
am cadccfd7: Merge "Update bionic to tzdata 2014h."
...
* commit 'cadccfd70821aeb107b8fc0084da04faecbfde2f':
Update bionic to tzdata 2014h.
2014-10-01 17:35:56 +00:00
Elliott Hughes
44ba5935e9
am 89fd3236: Merge "Fix update-tzdata.py to rebuild icu4c .dat file."
...
* commit '89fd32362bb62775aad001802bc79e3f07d7d62f':
Fix update-tzdata.py to rebuild icu4c .dat file.
2014-10-01 17:35:55 +00:00
Elliott Hughes
cadccfd708
Merge "Update bionic to tzdata 2014h."
2014-10-01 17:20:34 +00:00
Elliott Hughes
89fd32362b
Merge "Fix update-tzdata.py to rebuild icu4c .dat file."
2014-10-01 17:00:23 +00:00
Christopher Ferris
7d849ac378
Add stpcpy assembler version.
...
For generic, continue to use the C version of the code.
Bug: 13746695
Change-Id: I77426a70b06131f2373bb51265bea1240bb3f101
2014-09-30 19:23:26 -07:00
Dan Albert
92df938168
am 81156d93: Merge "Add coverage flag for libm."
...
* commit '81156d93c557e88379dd3e9d869dcc97a15293f5':
Add coverage flag for libm.
2014-10-01 01:38:35 +00:00
Hans Boehm
76ac4d0853
Make memory_order_acquire visible in global namespace
...
We were missing that using directive when including <atomic>.
Bug:17736764
Change-Id: Ie8ca92a952749415567bcd5fa21d56629a364660
2014-09-30 18:35:04 -07:00
Dan Albert
81156d93c5
Merge "Add coverage flag for libm."
2014-10-01 01:28:25 +00:00
Elliott Hughes
0c8fb51e6b
Update bionic to tzdata 2014h.
...
From the release notes:
Changes affecting past time stamps
America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28.
Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01,
not 1920-01-06. The old entry was based on a misinterpretation of Shanks.
Some more zones have been turned into links, when they differed
from existing zones only for older time stamps. As usual,
these changes affect UTC offsets in pre-1970 time stamps only.
Their old contents have been moved to the 'backzone' file.
The affected zones are: Africa/Blantyre, Africa/Bujumbura,
Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
Africa/Lusaka, Africa/Maseru, and Africa/Mbabane.
Bug: 17731498
Change-Id: If65b740d4e3a67075cca770655a1df17952c3da0
2014-09-30 17:35:38 -07:00
Elliott Hughes
f8896c6c93
Fix update-tzdata.py to rebuild icu4c .dat file.
...
Bug: 17731498
Change-Id: I4c810507c0ca9883dde1bece14530db80485b8f6
2014-09-30 17:30:01 -07:00
Elliott Hughes
d0fb0873f5
am 252c1ac9: Merge "Update our FreeBSD realpath(3) to upstream head."
...
* commit '252c1ac9738ff6187354f243ef118eac962b65dc':
Update our FreeBSD realpath(3) to upstream head.
2014-10-01 00:05:58 +00:00
Dmitriy Ivanov
fe1cfb1e09
am 701cf941: Merge "Fix mips build"
...
* commit '701cf9419b4df92bd959bbc6f18150f6ae76df7c':
Fix mips build
2014-09-30 23:57:33 +00:00
Dan Albert
090b25e8a9
am e04aa450: Merge "Clean up the pthread key tests."
...
* commit 'e04aa450c2b51ea066d1a1c37978cce808d13872':
Clean up the pthread key tests.
2014-09-30 23:57:33 +00:00
Dan Albert
12e3f22c7c
Add coverage flag for libm.
...
Change-Id: I195d38c5e1f50d1cc6d4353dc8857f11b803b7a3
2014-09-30 16:56:43 -07:00
Elliott Hughes
252c1ac973
Merge "Update our FreeBSD realpath(3) to upstream head."
2014-09-30 23:55:57 +00:00
Dmitriy Ivanov
c1429de2eb
am 1f7d5ac5: Merge "Fix unused DT entry warnings."
...
* commit '1f7d5ac53854a09bbcace08b3a1d1b9cf3f2eed3':
Fix unused DT entry warnings.
2014-09-30 23:52:10 +00:00
Dan Albert
483319a776
am 0481471b: Merge "Switch benchmarks and tests to libc++."
...
* commit '0481471b1bb95a90f632a9fb59c7a1767b9836c8':
Switch benchmarks and tests to libc++.
2014-09-30 23:51:26 +00:00
Dan Albert
c014e66a86
am e49491ad: Merge "Ignore multiple symbol definition errors."
...
* commit 'e49491ada4c8e7827329b56a93e5377433aa9084':
Ignore multiple symbol definition errors.
2014-09-30 23:51:25 +00:00
Dmitriy Ivanov
701cf9419b
Merge "Fix mips build"
2014-09-30 23:42:24 +00:00
Dan Albert
e04aa450c2
Merge "Clean up the pthread key tests."
2014-09-30 23:41:06 +00:00
Elliott Hughes
31e072fc9b
Update our FreeBSD realpath(3) to upstream head.
...
Change-Id: I8c89728184ecd2c1a28a05cefa84a5037d28b552
2014-09-30 16:40:41 -07:00
Dmitriy Ivanov
ecf532fa1c
Fix mips build
...
Change-Id: I4454e69a982f239b168678c5a681d1078b4bd4f1
2014-09-30 16:30:22 -07:00