OSDN Git Service
Dan Albert [Wed, 8 Oct 2014 07:07:03 +0000 (00:07 -0700)]
resolved conflicts for merge of
55ee845b to lmp-mr1-dev-plus-aosp
Change-Id: I134ec170a5fa1da065256b2da2e9c139db61b030
Dan Albert [Tue, 7 Oct 2014 18:10:36 +0000 (11:10 -0700)]
Inline helpers need to be exported unmangled.
__open_2() is used by the fortify implementation of open(2) in
fcntl.h, and as such needs an unmangled C name. For some reason
(inlining?), this doesn't cause problems at the default optimization
level, but does for -O0.
The rest of these didn't cause build failures, but they look suspect
and probably will, we just haven't caught them yet.
(cherry-pick of
658727e111ed6dee7be5239494f0764f7b1b02f8 with conflicts
in stdio.h and string.h.)
Bug:
17784968
Change-Id: I7391a7a8999ee204eaf6abd14a3d5373ea419d5b
Nick Kralevich [Wed, 8 Oct 2014 00:51:24 +0000 (00:51 +0000)]
am
ce92b41a: cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
* commit '
ce92b41a00fb86656055eceab9648a858721c3b1':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
Dan Albert [Wed, 8 Oct 2014 00:13:09 +0000 (00:13 +0000)]
am
c9e4f2de: Merge "Inline helpers need to be exported unmangled."
* commit '
c9e4f2de0a92ebf6dec336f383ba172efe1bb366':
Inline helpers need to be exported unmangled.
Dan Albert [Wed, 8 Oct 2014 00:01:08 +0000 (00:01 +0000)]
Merge "Inline helpers need to be exported unmangled."
Dan Albert [Tue, 7 Oct 2014 18:10:36 +0000 (11:10 -0700)]
Inline helpers need to be exported unmangled.
__open_2() is used by the fortify implementation of open(2) in
fcntl.h, and as such needs an unmangled C name. For some reason
(inlining?), this doesn't cause problems at the default optimization
level, but does for -O0.
The rest of these didn't cause build failures, but they look suspect
and probably will, we just haven't caught them yet.
Bug:
17784968
Change-Id: I7391a7a8999ee204eaf6abd14a3d5373ea419d5b
Nick Kralevich [Mon, 6 Oct 2014 21:49:00 +0000 (14:49 -0700)]
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
Otherwise the gcc compiler warning doesn't show up.
Add -Wno-error to fortify related tests. Fortify related tests
are expected to be examples of bad programs, and in many
cases shouldn't compile cleanly. Rewriting them to compile
cleanly isn't feasible nor desirable.
Bug:
17784968
(cherry picked from commit
1aaa17802c92d99ae170245c2b2f15a6c27b133e)
Change-Id: Ib6df1a3f44b55b1fff222e78395c10c51cd39817
Elliott Hughes [Tue, 7 Oct 2014 23:23:25 +0000 (23:23 +0000)]
am
e8d9057e: Merge "Work around a bug in Immersion\'s libImmEmulatorJ.so."
* commit '
e8d9057e3005f6f53f8ef2e876b43aea7a892292':
Work around a bug in Immersion's libImmEmulatorJ.so.
Elliott Hughes [Tue, 7 Oct 2014 23:22:28 +0000 (23:22 +0000)]
am
b5e7eba6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
* commit '
b5e7eba6d1b97e471996fcfe7dbde7cbba7512ef':
Work around a bug in Immersion's libImmEmulatorJ.so.
Elliott Hughes [Tue, 7 Oct 2014 23:02:11 +0000 (16:02 -0700)]
Work around a bug in Immersion's libImmEmulatorJ.so.
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL
pthread_mutex_t*. This gives them (and their users) one release to fix things.
Bug:
17443936
(cherry picked from commit
7d3f553f989f830976efa92ddc3c84661d4d42aa)
Change-Id: Ie26bbecd3a74d61113b51c18832872499b97ee86
Elliott Hughes [Tue, 7 Oct 2014 23:08:11 +0000 (23:08 +0000)]
Merge "Work around a bug in Immersion's libImmEmulatorJ.so."
Elliott Hughes [Tue, 7 Oct 2014 23:02:11 +0000 (16:02 -0700)]
Work around a bug in Immersion's libImmEmulatorJ.so.
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL
pthread_mutex_t*. This gives them (and their users) one release to fix things.
Bug:
17443936
Change-Id: I3b63c9a3dd63db0833f21073e323b3236a13b47a
Elliott Hughes [Tue, 7 Oct 2014 20:33:09 +0000 (13:33 -0700)]
resolved conflicts for merge of
ea8dea8c to lmp-mr1-dev-plus-aosp
Change-Id: I368c83e83c56a0c14d395540a715f5c42f8eafa8
Elliott Hughes [Tue, 7 Oct 2014 18:51:36 +0000 (18:51 +0000)]
Merge "Improve <sys/cdefs.h>." into lmp-mr1-dev
Dan Albert [Tue, 7 Oct 2014 18:47:04 +0000 (18:47 +0000)]
am
eeb9aa02: Merge "Use snprintf instead of sprintf."
* commit '
eeb9aa02b7f307a1d9b80731dd69ef9dd2f47e47':
Use snprintf instead of sprintf.
Elliott Hughes [Mon, 18 Aug 2014 21:45:42 +0000 (14:45 -0700)]
Improve <sys/cdefs.h>.
Fix and use __RENAME (and lose ___RENAME --- two underscores should be
enough for anybody). This was the point of this change, because I want
to use __RENAME to support the two basename variants and the two
strerror_r variants.
Lose a bunch of macros that weren't being used.
Lose three dead files from the DNS code.
Bug:
17784968
(cherry picked from commit
2cfb4e8e2e217ef0e4140dcbf9b3da809781158c)
Change-Id: I5e96146f92c0521248c78c0933bec5e9a9818222
Dan Albert [Tue, 7 Oct 2014 18:38:11 +0000 (18:38 +0000)]
Merge "Use snprintf instead of sprintf."
Dan Albert [Tue, 7 Oct 2014 18:07:53 +0000 (11:07 -0700)]
Use snprintf instead of sprintf.
At -O0, the attribute warning on sprintf is actually triggered (why
doesn't this happen with -Os?!) and promoted to an error by -Werror.
asctime64_r() is a non-standard function, but the IBM docs state that
the buffer is assumed to be at least 26 characters wide, and the
format string does limit to that (assuming a 4 digit year, also
defined by the IBM docs).
http://www-01.ibm.com/support/knowledgecenter/SSLTBW_2.1.0/com.ibm.zos.v2r1.bpxbd00/asctimer.htm
Change-Id: I1c884474a769aa16c53e985c3d8d694c478c1189
Christopher Ferris [Tue, 7 Oct 2014 17:54:11 +0000 (17:54 +0000)]
am
4aace385: am
2cf15571: am
40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
* commit '
4aace3852d2a83067c5ef10e06e2a33c6903940f':
DO NOT MERGE Re-add .save directive for arm assembler code.
Christopher Ferris [Tue, 7 Oct 2014 17:42:39 +0000 (17:42 +0000)]
am
2cf15571: am
40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
* commit '
2cf155713aaba451065d593335d544f2ada24ddf':
DO NOT MERGE Re-add .save directive for arm assembler code.
Dmitriy Ivanov [Tue, 7 Oct 2014 17:12:11 +0000 (17:12 +0000)]
am
6d2dd6a7: Merge "Fix 2nd arch prefix application"
* commit '
6d2dd6a74035a7ace838dd44e7910d54e15c11c2':
Fix 2nd arch prefix application
Dmitriy Ivanov [Tue, 7 Oct 2014 17:04:23 +0000 (17:04 +0000)]
Merge "Fix 2nd arch prefix application"
Dmitriy Ivanov [Tue, 7 Oct 2014 16:46:46 +0000 (09:46 -0700)]
Fix 2nd arch prefix application
Bug:
17887283
Change-Id: I7b3b2332212fe416d6b5f5c2e5c1e07605ba09aa
Christopher Ferris [Tue, 7 Oct 2014 15:27:36 +0000 (15:27 +0000)]
am
40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
* commit '
40bc7cd4ed9fb848a7b3d934f69669f64ceed707':
DO NOT MERGE Re-add .save directive for arm assembler code.
Elliott Hughes [Tue, 7 Oct 2014 00:55:38 +0000 (00:55 +0000)]
am
6c4e16f6: Merge "further cleanup memcpy fortify implementation" into lmp-mr1-dev
* commit '
6c4e16f634a8ee07fc0c3cc5299c9f7f03c5f8bf':
further cleanup memcpy fortify implementation
Christopher Ferris [Tue, 7 Oct 2014 00:53:54 +0000 (17:53 -0700)]
resolved conflicts for merge of
27355aff to lmp-mr1-dev-plus-aosp
Change-Id: Ice2d5d99788eb1fd9bcdfc288a36742f6e73d360
Elliott Hughes [Tue, 7 Oct 2014 00:30:34 +0000 (00:30 +0000)]
Merge "further cleanup memcpy fortify implementation" into lmp-mr1-dev
Christopher Ferris [Tue, 7 Oct 2014 00:20:10 +0000 (00:20 +0000)]
am
d11eac34: Force export symbols on all x86 variants in libc.
* commit '
d11eac3455a059a092ceee92eda9905e1d661e94':
Force export symbols on all x86 variants in libc.
Christopher Ferris [Mon, 6 Oct 2014 23:50:42 +0000 (23:50 +0000)]
am
81fca356: Merge "Force export symbols on all x86 variants in libc."
* commit '
81fca35672df90e2f770e67bbf7e7735c6ff8bd8':
Force export symbols on all x86 variants in libc.
Christopher Ferris [Mon, 6 Oct 2014 23:45:02 +0000 (23:45 +0000)]
Merge "Force export symbols on all x86 variants in libc."
Christopher Ferris [Mon, 6 Oct 2014 22:11:28 +0000 (15:11 -0700)]
Force export symbols on all x86 variants in libc.
For silvermont, the __popcountsi2 symbol does not get exported by libc.
But for atom, this symbol is exported. Since we already exported this symbol
for previous releases, it's better to just follow through and force
the export, but only for 32 bit. x86 64 bit will not export this symbol.
Bug:
17681440
(cherry picked from commit
d11eac3455a059a092ceee92eda9905e1d661e94)
Change-Id: I93704c721d98d569922f606f214069bda24872ba
Nick Kralevich [Mon, 6 Oct 2014 23:28:47 +0000 (23:28 +0000)]
am
b5cba608: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
* commit '
b5cba6081bc9179d3ea2aa1bfd77dd8de1c88525':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
Nick Kralevich [Mon, 6 Oct 2014 23:21:03 +0000 (23:21 +0000)]
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
Nick Kralevich [Sun, 5 Oct 2014 13:52:24 +0000 (06:52 -0700)]
further cleanup memcpy fortify implementation
Bug:
17784968
(cherry picked from commit
b84f667e9312611536a564700daea11c12b6fcfa)
Change-Id: I68fc2cc0a1ee7f0887edf3681eb83ef678de1383
Christopher Ferris [Mon, 6 Oct 2014 22:11:28 +0000 (15:11 -0700)]
Force export symbols on all x86 variants in libc.
For silvermont, the __popcountsi2 symbol does not get exported by libc.
But for atom, this symbol is exported. Since we already exported this symbol
for previous releases, it's better to just follow through and force
the export, but only for 32 bit. x86 64 bit will not export this symbol.
Bug:
17681440
Change-Id: I6c62245f0960910f64baaaf6d9d090bf3ea5f435
Nick Kralevich [Mon, 6 Oct 2014 22:50:24 +0000 (15:50 -0700)]
resolved conflicts for merge of
7ad2147a to lmp-mr1-dev-plus-aosp
Change-Id: Ie43710f4e5b8d5638bce505e9bef80e6cdd065bc
Nick Kralevich [Mon, 6 Oct 2014 21:49:00 +0000 (14:49 -0700)]
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
Otherwise the gcc compiler warning doesn't show up.
Add -Wno-error to fortify related tests. Fortify related tests
are expected to be examples of bad programs, and in many
cases shouldn't compile cleanly. Rewriting them to compile
cleanly isn't feasible nor desirable.
Bug:
17784968
Change-Id: I93bececa7444d965f18c7c27d46e7abce5c49a02
Dan Albert [Mon, 6 Oct 2014 19:54:37 +0000 (19:54 +0000)]
am
9969feca: Merge "Add compile time test infrastructure for bionic."
* commit '
9969fecad23edebcbc4f32a50dc65a2876a2478f':
Add compile time test infrastructure for bionic.
Dan Albert [Mon, 6 Oct 2014 19:45:31 +0000 (19:45 +0000)]
Merge "Add compile time test infrastructure for bionic."
Dmitriy Ivanov [Mon, 6 Oct 2014 19:28:49 +0000 (19:28 +0000)]
am
f4320e86: Merge "Resolve "unused DT entry" warnings for x86_64"
* commit '
f4320e867cbc7764d2f1fa8ac64da9cc38cba733':
Resolve "unused DT entry" warnings for x86_64
Dmitriy Ivanov [Mon, 6 Oct 2014 19:07:57 +0000 (19:07 +0000)]
Merge "Resolve "unused DT entry" warnings for x86_64"
Dan Albert [Fri, 3 Oct 2014 20:46:42 +0000 (13:46 -0700)]
Add compile time test infrastructure for bionic.
Actual tests to follow...
Bug:
17782583
Change-Id: I22857f19899c3b39dbc2e5473ad3be1a8a291139
Dmitriy Ivanov [Mon, 6 Oct 2014 18:30:43 +0000 (11:30 -0700)]
Resolve "unused DT entry" warnings for x86_64
Change-Id: I3a2c87bf6e6259313cd9203389623f13b7405ef3
Dmitriy Ivanov [Mon, 6 Oct 2014 17:29:06 +0000 (17:29 +0000)]
am
6d569b92: Merge "Add file_offset parameter to android_extinfo"
* commit '
6d569b92012543a297dccf2dfeaa648d07b3c133':
Add file_offset parameter to android_extinfo
Dmitriy Ivanov [Mon, 6 Oct 2014 17:19:38 +0000 (17:19 +0000)]
Merge "Add file_offset parameter to android_extinfo"
Nick Kralevich [Sat, 4 Oct 2014 22:20:00 +0000 (15:20 -0700)]
string.h: remove unused variable
(cherry picked from commit
48be71d02b6cc4e6493d38cdd6b7779032c38901)
Bug:
17784968
Change-Id: Iac7732fb4f7fe42977cb9f62472bb636e17e5232
Dmitriy Ivanov [Sat, 4 Oct 2014 00:52:44 +0000 (17:52 -0700)]
Add file_offset parameter to android_extinfo
Bug:
17762003
Change-Id: I8fb267a3155acef3dba534038cf5d1ef00d7154b
Nick Kralevich [Mon, 6 Oct 2014 00:44:49 +0000 (00:44 +0000)]
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"
Nick Kralevich [Mon, 6 Oct 2014 00:40:07 +0000 (00:40 +0000)]
Merge "Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions""
Nick Kralevich [Mon, 6 Oct 2014 00:39:47 +0000 (00:39 +0000)]
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
Nick Kralevich [Mon, 6 Oct 2014 00:17:23 +0000 (00:17 +0000)]
am
558ec810: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
* commit '
558ec8103bad6eed78c3e372fc9b2535a3486745':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
Nick Kralevich [Mon, 6 Oct 2014 00:10:47 +0000 (00:10 +0000)]
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
Nick Kralevich [Sun, 5 Oct 2014 16:54:37 +0000 (16:54 +0000)]
am
db6fea86: Merge "further cleanup memcpy fortify implementation"
* commit '
db6fea86a5cb70c5aaad61ef6c126557f36e138b':
further cleanup memcpy fortify implementation
Nick Kralevich [Sun, 5 Oct 2014 16:43:24 +0000 (16:43 +0000)]
Merge "further cleanup memcpy fortify implementation"
Nick Kralevich [Sun, 5 Oct 2014 13:52:24 +0000 (06:52 -0700)]
further cleanup memcpy fortify implementation
Change-Id: I0380f3c8ca8f9bb8a206accd839c32c9daf13c56
Nick Kralevich [Sat, 4 Oct 2014 22:26:29 +0000 (15:26 -0700)]
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
Nick Kralevich [Sat, 4 Oct 2014 22:47:07 +0000 (22:47 +0000)]
am
ae97a776: Merge "string.h: remove unused variable"
* commit '
ae97a776ea900e5923d6d320d72dcc04b224796e':
string.h: remove unused variable
Nick Kralevich [Sat, 4 Oct 2014 22:38:08 +0000 (22:38 +0000)]
Merge "string.h: remove unused variable"
Nick Kralevich [Sat, 4 Oct 2014 22:20:00 +0000 (15:20 -0700)]
string.h: remove unused variable
Change-Id: I08b7dab1b374ad427fcbee4183f2c7d93d0199a9
Dmitriy Ivanov [Sat, 4 Oct 2014 18:16:42 +0000 (11:16 -0700)]
resolved conflicts for merge of
02542b3b to lmp-mr1-dev-plus-aosp
Change-Id: Ib881abd163fd737719b665c447055c7883a7b791
Alex Van Brunt [Sat, 4 Oct 2014 16:44:11 +0000 (16:44 +0000)]
am
a5087148: Reimplement clock(3) using clock_gettime(3)
* commit '
a508714800242b294291060641ed35d719bdc857':
Reimplement clock(3) using clock_gettime(3)
Elliott Hughes [Sat, 4 Oct 2014 02:17:19 +0000 (02:17 +0000)]
am
4ef0e59f: Merge "Reimplement clock(3) using clock_gettime(3)"
* commit '
4ef0e59f339ad138eabe3bc408beda6004f5ea83':
Reimplement clock(3) using clock_gettime(3)
Alex Van Brunt [Fri, 26 Sep 2014 20:32:47 +0000 (13:32 -0700)]
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
Elliott Hughes [Sat, 4 Oct 2014 01:57:42 +0000 (01:57 +0000)]
Merge "Reimplement clock(3) using clock_gettime(3)"
Alex Van Brunt [Fri, 26 Sep 2014 20:32:47 +0000 (13:32 -0700)]
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
Elliott Hughes [Sat, 4 Oct 2014 00:06:27 +0000 (00:06 +0000)]
am
ea9800e9: Explain why clock(3) isn\'t broken.
* commit '
ea9800e98598c71fe76c4e2a0d0498b6bd490a83':
Explain why clock(3) isn't broken.
Elliott Hughes [Fri, 12 Sep 2014 23:33:37 +0000 (16:33 -0700)]
Explain why clock(3) isn't broken.
Bug:
17441123
Bug:
17814435
(cherry picked from commit
f83c208b82c78dad07f4065f63bdd354f5ef9951)
Change-Id: I2065afe73b79a8d86404edee16e983625d902cdc
Dmitriy Ivanov [Fri, 3 Oct 2014 19:21:57 +0000 (12:21 -0700)]
resolved conflicts for merge of
04f5f410 to lmp-mr1-dev-plus-aosp
Change-Id: I921c62dbe265b1be4d373d1988951de0f6743fba
Dmitriy Ivanov [Fri, 3 Oct 2014 16:47:05 +0000 (16:47 +0000)]
am
d5df4124: Merge "Add RTLD_NODELETE flag support"
* commit '
d5df4124bbbb30411ef19f7c2fbb3987d0eb9630':
Add RTLD_NODELETE flag support
Ningsheng Jian [Tue, 16 Sep 2014 07:22:10 +0000 (15:22 +0800)]
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
Dmitriy Ivanov [Thu, 2 Oct 2014 21:47:29 +0000 (21:47 +0000)]
Merge "Add RTLD_NODELETE flag support"
Dmitriy Ivanov [Thu, 2 Oct 2014 20:44:20 +0000 (13:44 -0700)]
Fixes to linker code after the conflict resolution
Change-Id: Icd0728604a865b73e7af0e0aee38971a612935f2
Dmitriy Ivanov [Thu, 2 Oct 2014 20:08:39 +0000 (13:08 -0700)]
Undo the bad work of Automerger
Change-Id: I585388aebc556a094db4c22e647edacea7cde129
Dmitriy Ivanov [Thu, 2 Oct 2014 19:49:42 +0000 (12:49 -0700)]
Revert "L-MR1 specific fixes"
This reverts commit
1cd0c6777f35b531c9ce78397d0915aa521b3e87.
Dmitriy Ivanov [Thu, 2 Oct 2014 19:41:50 +0000 (19:41 +0000)]
am
1cd0c677: L-MR1 specific fixes
* commit '
1cd0c6777f35b531c9ce78397d0915aa521b3e87':
L-MR1 specific fixes
Dmitriy Ivanov [Thu, 2 Oct 2014 19:38:54 +0000 (12:38 -0700)]
resolved conflicts for merge of
7d971ec1 to lmp-mr1-dev-plus-aosp
Change-Id: I1cd01e5c0dd00cd55594654d53f7e0cb6edf35d9
Dmitriy Ivanov [Thu, 2 Oct 2014 19:33:10 +0000 (12:33 -0700)]
resolved conflicts for merge of
f4cb6313 to lmp-mr1-dev-plus-aosp
Change-Id: I9c033fa82c7bf07e06157227f5162d603804b7d6
Dmitriy Ivanov [Thu, 2 Oct 2014 19:23:57 +0000 (19:23 +0000)]
am
ef1306d7: Refactoring: C++11 style DISABLE_ bionic marcos
* commit '
ef1306d77718cc74a8df5673a15649dea317571d':
Refactoring: C++11 style DISABLE_ bionic marcos
Dmitriy Ivanov [Thu, 2 Oct 2014 19:22:07 +0000 (12:22 -0700)]
resolved conflicts for merge of
61c4147f to lmp-mr1-dev-plus-aosp
Change-Id: I4ed15dbb2136a1984f7651dcc85d05e3e585ac51
Dmitriy Ivanov [Thu, 2 Oct 2014 19:16:19 +0000 (12:16 -0700)]
resolved conflicts for merge of
ae69a958 to lmp-mr1-dev-plus-aosp
Change-Id: Ia466577ef6e627cc6fcef46aa37cce21acbc8519
Dmitriy Ivanov [Thu, 2 Oct 2014 18:52:06 +0000 (11:52 -0700)]
resolved conflicts for merge of
c0133a73 to lmp-mr1-dev-plus-aosp
Change-Id: I31d81e91d796fa27f9c88a7edc96c97320ade72c
Dmitriy Ivanov [Thu, 2 Oct 2014 18:34:05 +0000 (11:34 -0700)]
resolved conflicts for merge of
8de1ddec to lmp-mr1-dev-plus-aosp
Change-Id: I9bb063dcf684307181ce4a2b1e5f96bd0d78aaff
Dmitriy Ivanov [Thu, 2 Oct 2014 18:27:57 +0000 (11:27 -0700)]
resolved conflicts for merge of
59c12a65 to lmp-mr1-dev-plus-aosp
Change-Id: I92667dd3d55c8cfd2586c88362fd542c7a6ff9b2
Dmitriy Ivanov [Thu, 2 Oct 2014 18:06:05 +0000 (11:06 -0700)]
resolved conflicts for merge of
81fe2b16 to lmp-mr1-dev-plus-aosp
Change-Id: I61272d86ebf0d40262e88f5f4327cf97be035bda
Dmitriy Ivanov [Thu, 2 Oct 2014 17:54:08 +0000 (10:54 -0700)]
resolved conflicts for merge of
7210c41f to lmp-mr1-dev-plus-aosp
Change-Id: I44d84a95f506e89e77cce8c218083a80ca5724b9
Dmitriy Ivanov [Thu, 2 Oct 2014 17:34:40 +0000 (17:34 +0000)]
am
4466bd72: Implement LinkedList::visit()
* commit '
4466bd72fb9daeb0ef8f250e8314b555aab30817':
Implement LinkedList::visit()
Dmitriy Ivanov [Thu, 2 Oct 2014 17:33:04 +0000 (10:33 -0700)]
resolved conflicts for merge of
ff01f6fc to lmp-mr1-dev-plus-aosp
Change-Id: I90e7700708a305a7e93dd3ef3a32c5508038b53b
Dmitriy Ivanov [Thu, 2 Oct 2014 17:28:43 +0000 (10:28 -0700)]
resolved conflicts for merge of
4d01d08c to lmp-mr1-dev-plus-aosp
Change-Id: Icaf503240281596de05ee331457200b61d57ab46
Dmitriy Ivanov [Thu, 2 Oct 2014 17:21:34 +0000 (10:21 -0700)]
resolved conflicts for merge of
cfad7ae9 to lmp-mr1-dev-plus-aosp
Change-Id: I119e37c6689c4cc49663748a72c17dc55a362b02
Dmitriy Ivanov [Thu, 2 Oct 2014 17:06:50 +0000 (17:06 +0000)]
am
5dfe802d: Remove unnecessary calls to LinkedList::clear()
* commit '
5dfe802d0dedbfce355a7ece5bc77c7346941bb2':
Remove unnecessary calls to LinkedList::clear()
Dmitriy Ivanov [Thu, 2 Oct 2014 17:05:02 +0000 (10:05 -0700)]
resolved conflicts for merge of
93c3f420 to lmp-mr1-dev-plus-aosp
Change-Id: I3cd9c572ec096dc14e0356fe2725074bc7af29d3
Dmitriy Ivanov [Thu, 2 Oct 2014 16:59:26 +0000 (09:59 -0700)]
resolved conflicts for merge of
3bbd218e to lmp-mr1-dev-plus-aosp
Change-Id: Ie7f85be196a44ab59554384274f2022239f91b0e
Dmitriy Ivanov [Thu, 2 Oct 2014 16:51:07 +0000 (16:51 +0000)]
Merge "resolved conflicts for merge of
bd321c11 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Dmitriy Ivanov [Thu, 2 Oct 2014 16:49:28 +0000 (09:49 -0700)]
resolved conflicts for merge of
bd321c11 to lmp-mr1-dev-plus-aosp
Change-Id: I6ee8a75840073ed00eda9f8f0fbd372cdcfb0be0
Dmitriy Ivanov [Thu, 2 Oct 2014 15:53:42 +0000 (08:53 -0700)]
resolved conflicts for merge of
31b88da8 to lmp-mr1-dev-plus-aosp
Change-Id: I3081cba9e1372adc085380cda01d4825543a6727
Elliott Hughes [Thu, 2 Oct 2014 12:37:01 +0000 (12:37 +0000)]
am
e4f8962a: Merge "Update bionic to tzdata 2014h." into lmp-mr1-dev
* commit '
e4f8962ab5b4fb64842f4635fdf01a860bb180ee':
Update bionic to tzdata 2014h.
Elliott Hughes [Thu, 2 Oct 2014 12:37:00 +0000 (12:37 +0000)]
am
b5f5b0e4: Fix update-tzdata.py to rebuild icu4c .dat file.
* commit '
b5f5b0e418e5c382573e367dd4aff9373180bbe4':
Fix update-tzdata.py to rebuild icu4c .dat file.
Dmitriy Ivanov [Wed, 1 Oct 2014 23:26:49 +0000 (16:26 -0700)]
L-MR1 specific fixes
Reset soinfo version to 0.
Disable ifunc test for arm64 because of old toolchain
in lmp-mr1-dev branch
Note: this commit should be reverted in -plus-aosp branch.
Change-Id: I2d6d996d43bc35d5d4975c745779f43a988b31e6
Dmitriy Ivanov [Tue, 9 Sep 2014 17:21:42 +0000 (10:21 -0700)]
Fix unload of recursively linked library
Expanded test for recursive libs. Fixed bug with unnecessary
soinfo_free of already loaded library.
(cherry picked from commit
a6ac54a215d6b64f5cc5a59b66c1dbfbb41ea9f5)
Change-Id: I6907c723d9fbdf6b2777f3f236b1e29b0843edd6
Dmitriy Ivanov [Thu, 11 Sep 2014 22:16:03 +0000 (15:16 -0700)]
Add IFUNC support for arm64 and IRELATIVE reloc
There are number of changes in the way IFUNC related relocations are done:
1. IRELATIVE relocations are now supported for x86/x86_64 and arm64.
2. IFUNC relocations are now relying on static linker to generate
them in correct order - this removes necessety of additional
relocation pass for ifuncs.
3. Related to 2: rela?.dyn relocations are preformed before .plt ones.
4. Ifunc are resolved on symbol lookup this approach allowed to avoid
mprotect(PROT_WRITE) call on r-x program segments.
Bug:
17399706
Bug:
17177284
(cherry picked from commit
9aea164457c269c475592da36b4655d45f55c7bc)
Change-Id: Ie19d900fc203beb93faf8943b0d06d534a6de4ad