Christopher Ferris
c5d30c27e6
am ac6fc5be: (-s ours) am 4aace385: am 2cf15571: am 40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
...
* commit 'ac6fc5befd152814398bccb0443da6704f614f0f':
DO NOT MERGE Re-add .save directive for arm assembler code.
2014-10-07 18:03:05 +00:00
Christopher Ferris
ac6fc5befd
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.
2014-10-07 17:54:11 +00:00
Christopher Ferris
4aace3852d
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.
2014-10-07 17:42:39 +00:00
Dmitriy Ivanov
929ec5c950
am c4d97f51: am 6d2dd6a7: Merge "Fix 2nd arch prefix application"
...
* commit 'c4d97f51476def0852693b4002e9ba65df8cd5a6':
Fix 2nd arch prefix application
2014-10-07 17:14:21 +00:00
Dmitriy Ivanov
9ec3d2e69a
am 6d2dd6a7: Merge "Fix 2nd arch prefix application"
...
* commit '6d2dd6a74035a7ace838dd44e7910d54e15c11c2':
Fix 2nd arch prefix application
2014-10-07 17:12:58 +00:00
Dmitriy Ivanov
c4d97f5147
am 6d2dd6a7: Merge "Fix 2nd arch prefix application"
...
* commit '6d2dd6a74035a7ace838dd44e7910d54e15c11c2':
Fix 2nd arch prefix application
2014-10-07 17:12:11 +00:00
Dmitriy Ivanov
6d2dd6a740
Merge "Fix 2nd arch prefix application"
2014-10-07 17:04:24 +00:00
Dmitriy Ivanov
75d66dd9a7
Fix 2nd arch prefix application
...
Bug: 17887283
Change-Id: I7b3b2332212fe416d6b5f5c2e5c1e07605ba09aa
2014-10-07 09:46:46 -07:00
Christopher Ferris
5ad21d60fb
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.
2014-10-07 15:31:51 +00:00
Christopher Ferris
2cf155713a
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.
2014-10-07 15:27:36 +00:00
Elliott Hughes
97300b3878
am 106edd3f: am 6c4e16f6: Merge "further cleanup memcpy fortify implementation" into lmp-mr1-dev
...
* commit '106edd3fa795f41bd8b527732a6c2be74ff4164a':
further cleanup memcpy fortify implementation
2014-10-07 01:02:57 +00:00
Christopher Ferris
8d0c9dfc2c
am a87052c9: resolved conflicts for merge of 27355aff to lmp-mr1-dev-plus-aosp
...
* commit 'a87052c9a3f71f6017c3a4657d9ce01d8923e969':
Force export symbols on all x86 variants in libc.
2014-10-07 00:58:44 +00:00
Elliott Hughes
106edd3fa7
am 6c4e16f6: Merge "further cleanup memcpy fortify implementation" into lmp-mr1-dev
...
* commit '6c4e16f634a8ee07fc0c3cc5299c9f7f03c5f8bf':
further cleanup memcpy fortify implementation
2014-10-07 00:55:38 +00:00
Christopher Ferris
a87052c9a3
resolved conflicts for merge of 27355aff to lmp-mr1-dev-plus-aosp
...
Change-Id: Ice2d5d99788eb1fd9bcdfc288a36742f6e73d360
2014-10-06 17:53:54 -07:00
Elliott Hughes
6c4e16f634
Merge "further cleanup memcpy fortify implementation" into lmp-mr1-dev
2014-10-07 00:30:34 +00:00
Christopher Ferris
27355affc1
am d11eac34: Force export symbols on all x86 variants in libc.
...
* commit 'd11eac3455a059a092ceee92eda9905e1d661e94':
Force export symbols on all x86 variants in libc.
2014-10-07 00:20:10 +00:00
Christopher Ferris
a0da9f976a
am 015a48af: am 81fca356: Merge "Force export symbols on all x86 variants in libc."
...
* commit '015a48af3634b7337561a35544ecf2bc78549b0f':
Force export symbols on all x86 variants in libc.
2014-10-07 00:03:54 +00:00
Nick Kralevich
3ccb3fcba4
am d9813e3e: am b5cba608: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit 'd9813e3e7fbf02955d2dd9f9c9ef97a8719b15a3':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-07 00:03:44 +00:00
Nick Kralevich
77e5dd7720
am 75a932c5: resolved conflicts for merge of 7ad2147a to lmp-mr1-dev-plus-aosp
...
* commit '75a932c5dd959a1678929a7a8211d30a85a907fc':
string.h: remove unused variable
2014-10-06 23:58:37 +00:00
Christopher Ferris
fae2ad067e
am 81fca356: Merge "Force export symbols on all x86 variants in libc."
...
* commit '81fca35672df90e2f770e67bbf7e7735c6ff8bd8':
Force export symbols on all x86 variants in libc.
2014-10-06 23:51:43 +00:00
Christopher Ferris
015a48af36
am 81fca356: Merge "Force export symbols on all x86 variants in libc."
...
* commit '81fca35672df90e2f770e67bbf7e7735c6ff8bd8':
Force export symbols on all x86 variants in libc.
2014-10-06 23:50:42 +00:00
Christopher Ferris
81fca35672
Merge "Force export symbols on all x86 variants in libc."
2014-10-06 23:45:03 +00:00
Christopher Ferris
6869d26ad9
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
2014-10-06 16:41:46 -07:00
Christopher Ferris
9a7d31eb9c
Merge "resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
2014-10-06 23:32:53 +00:00
Christopher Ferris
d61d2b7b80
resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp
...
Change-Id: I3cd9056d5d689b783f4afa870397ad4d9de357f5
2014-10-06 16:30:45 -07:00
Nick Kralevich
2d04b5e09f
am b5cba608: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit 'b5cba6081bc9179d3ea2aa1bfd77dd8de1c88525':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-06 23:29:04 +00:00
Nick Kralevich
d9813e3e7f
am b5cba608: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit 'b5cba6081bc9179d3ea2aa1bfd77dd8de1c88525':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-06 23:28:47 +00:00
Nick Kralevich
b5cba6081b
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 23:21:04 +00:00
Nick Kralevich
db408bf421
further cleanup memcpy fortify implementation
...
Bug: 17784968
(cherry picked from commit b84f667e9312611536a564700daea11c12b6fcfa)
Change-Id: I68fc2cc0a1ee7f0887edf3681eb83ef678de1383
2014-10-06 16:18:32 -07:00
Christopher Ferris
d11eac3455
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
2014-10-06 15:51:26 -07:00
Nick Kralevich
75a932c5dd
resolved conflicts for merge of 7ad2147a to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie43710f4e5b8d5638bce505e9bef80e6cdd065bc
2014-10-06 15:50:24 -07:00
Nick Kralevich
1aaa17802c
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
2014-10-06 15:11:52 -07:00
Dan Albert
1f41103f26
am 8049eb75: am 9969feca: Merge "Add compile time test infrastructure for bionic."
...
* commit '8049eb7578ac1e37271da5dca000157687de5162':
Add compile time test infrastructure for bionic.
2014-10-06 19:56:42 +00:00
Dan Albert
65c10a1477
am 9969feca: Merge "Add compile time test infrastructure for bionic."
...
* commit '9969fecad23edebcbc4f32a50dc65a2876a2478f':
Add compile time test infrastructure for bionic.
2014-10-06 19:54:52 +00:00
Dan Albert
8049eb7578
am 9969feca: Merge "Add compile time test infrastructure for bionic."
...
* commit '9969fecad23edebcbc4f32a50dc65a2876a2478f':
Add compile time test infrastructure for bionic.
2014-10-06 19:54:37 +00:00
Dan Albert
9969fecad2
Merge "Add compile time test infrastructure for bionic."
2014-10-06 19:45:32 +00:00
Dmitriy Ivanov
30aa4c2ddb
am bc7ecf7a: am f4320e86: Merge "Resolve "unused DT entry" warnings for x86_64"
...
* commit 'bc7ecf7af2d1b06161badddcead0d9f8c66dbd12':
Resolve "unused DT entry" warnings for x86_64
2014-10-06 19:36:10 +00:00
Dmitriy Ivanov
bc7ecf7af2
am f4320e86: Merge "Resolve "unused DT entry" warnings for x86_64"
...
* commit 'f4320e867cbc7764d2f1fa8ac64da9cc38cba733':
Resolve "unused DT entry" warnings for x86_64
2014-10-06 19:28:49 +00:00
Dmitriy Ivanov
b9d4a64866
am f4320e86: Merge "Resolve "unused DT entry" warnings for x86_64"
...
* commit 'f4320e867cbc7764d2f1fa8ac64da9cc38cba733':
Resolve "unused DT entry" warnings for x86_64
2014-10-06 19:14:51 +00:00
Dmitriy Ivanov
f4320e867c
Merge "Resolve "unused DT entry" warnings for x86_64"
2014-10-06 19:07:58 +00:00
Dan Albert
f04a8bc226
Add compile time test infrastructure for bionic.
...
Actual tests to follow...
Bug: 17782583
Change-Id: I22857f19899c3b39dbc2e5473ad3be1a8a291139
2014-10-06 11:38:01 -07:00
Dmitriy Ivanov
513e29e16f
Resolve "unused DT entry" warnings for x86_64
...
Change-Id: I3a2c87bf6e6259313cd9203389623f13b7405ef3
2014-10-06 11:32:19 -07:00
Dmitriy Ivanov
5830490dd7
am bfbe68fc: am 6d569b92: Merge "Add file_offset parameter to android_extinfo"
...
* commit 'bfbe68fc248d4ff69d963aecbab4a42f6def7ba0':
Add file_offset parameter to android_extinfo
2014-10-06 17:33:59 +00:00
Dmitriy Ivanov
bfbe68fc24
am 6d569b92: Merge "Add file_offset parameter to android_extinfo"
...
* commit '6d569b92012543a297dccf2dfeaa648d07b3c133':
Add file_offset parameter to android_extinfo
2014-10-06 17:29:06 +00:00
Dmitriy Ivanov
47388d8297
am 6d569b92: Merge "Add file_offset parameter to android_extinfo"
...
* commit '6d569b92012543a297dccf2dfeaa648d07b3c133':
Add file_offset parameter to android_extinfo
2014-10-06 17:28:54 +00:00
Dmitriy Ivanov
6d569b9201
Merge "Add file_offset parameter to android_extinfo"
2014-10-06 17:19:39 +00:00
Nick Kralevich
7ad2147a08
string.h: remove unused variable
...
(cherry picked from commit 48be71d02b6cc4e6493d38cdd6b7779032c38901)
Bug: 17784968
Change-Id: Iac7732fb4f7fe42977cb9f62472bb636e17e5232
2014-10-06 10:17:01 -07: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
7912cc7e9e
am e88b00c5: am a6eef3be: Merge "Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions""
...
* commit 'e88b00c51d87ce2182774e40939fe51507de6a40':
Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 00:48:54 +00:00
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