Elliott Hughes
06b596104a
Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
2012-10-30 12:57:58 -07:00
Elliott Hughes
c7358ee57c
am 743a273e
: am 1f21ece4
: Merge "Clean up the <libgen.h> implementation a little, bring in tests."
...
* commit '743a273e40e49c199d79462338fc606ae12c999f':
Clean up the <libgen.h> implementation a little, bring in tests.
2012-10-30 10:11:44 -07:00
Elliott Hughes
7d617d0db9
am 5f787190
: am 4d36b0bd
: Merge "Fix the pthread_join on self error case."
...
* commit '5f787190a9e7a749d95f566f920b78eafcd05050':
Fix the pthread_join on self error case.
2012-10-30 10:11:43 -07:00
Elliott Hughes
5e805afa79
am 0b8fa1d4
: am 9297af94
: Merge "Fix a potential NULL pointer dereference in _init_thread()."
...
* commit '0b8fa1d456f6cf831be41a6dc6b0a67e89f01bd5':
Fix a potential NULL pointer dereference in _init_thread().
2012-10-30 10:11:42 -07:00
Elliott Hughes
d4834a217e
am 40e467ec
: am 33c4a3ad
: Merge "libc: Fix alphasort() signature (and implementation)."
...
* commit '40e467ec668b59be25491bd44bf348a884d6a68d':
libc: Fix alphasort() signature (and implementation).
2012-10-30 10:11:41 -07:00
Elliott Hughes
5ce5edd6cf
am 85765609
: am 8f9a1eb1
: Merge "Upgrade to tzdata2012h."
...
* commit '8576560979e3d126ef8204959b87336d980b390b':
Upgrade to tzdata2012h.
2012-10-30 10:11:40 -07:00
Elliott Hughes
96b52e104a
am a67cedb5
: am 9e783963
: Merge "Clean up the implementation of the <dirent.h> functions."
...
* commit 'a67cedb52cb57f116a545482bddb979d995fd634':
Clean up the implementation of the <dirent.h> functions.
2012-10-30 10:11:39 -07:00
Elliott Hughes
743a273e40
am 1f21ece4
: Merge "Clean up the <libgen.h> implementation a little, bring in tests."
...
* commit '1f21ece48a87abbbdd9fb939b79a1dd81fb867eb':
Clean up the <libgen.h> implementation a little, bring in tests.
2012-10-29 17:15:12 -07:00
Elliott Hughes
5f787190a9
am 4d36b0bd
: Merge "Fix the pthread_join on self error case."
...
* commit '4d36b0bd38559ae0376b61a0ac2f5fa8329ec56d':
Fix the pthread_join on self error case.
2012-10-29 17:15:09 -07:00
Elliott Hughes
0b8fa1d456
am 9297af94
: Merge "Fix a potential NULL pointer dereference in _init_thread()."
...
* commit '9297af943887d9d6974aaec8c45a4e7d93422965':
Fix a potential NULL pointer dereference in _init_thread().
2012-10-29 17:15:03 -07:00
Elliott Hughes
40e467ec66
am 33c4a3ad
: Merge "libc: Fix alphasort() signature (and implementation)."
...
* commit '33c4a3adde3cf1753af0661f48ce86358e105277':
libc: Fix alphasort() signature (and implementation).
2012-10-29 17:15:02 -07:00
Elliott Hughes
8576560979
am 8f9a1eb1
: Merge "Upgrade to tzdata2012h."
...
* commit '8f9a1eb108f22fc2ce7283ef184d909ec0ca1152':
Upgrade to tzdata2012h.
2012-10-29 17:15:01 -07:00
Elliott Hughes
a67cedb52c
am 9e783963
: Merge "Clean up the implementation of the <dirent.h> functions."
...
* commit '9e783963d58acf48e06902236ea64c7f5b337a0f':
Clean up the implementation of the <dirent.h> functions.
2012-10-29 17:14:59 -07:00
Elliott Hughes
58b575485c
Clean up the <libgen.h> implementation a little, bring in tests.
...
Most of these tests were in system/extras, but I've added more to cover other
cases explicitly mentioned by POSIX.
Change-Id: I5e8d77e4179028d77306935cceadbb505515dcde
2012-10-29 14:27:10 -07:00
Sergey Melnikov
10ce96944e
Fix bug in pthread_join, pthread_exit, pthread_detach
...
pthread_no_op_detach_after_join test from bionic-unit-tests hangs
on x86 emulator. There is a race in the pthread_join, pthread_exit,
pthread_detach functions:
- pthread_join waits for the non-detached thread
- pthread_detach sets the detached flag on that thread
- the thread executes pthread_exit which just kills the now-detached
thread, without sending the join notification.
This patch improves the test so it fails on ARM too, and modifies
pthread_detach to behave more like glibc, not setting the detach state if
called on a thread that's already being joined (but not returning an error).
Change-Id: I87dc688221ce979ef5178753dd63d01ac0b108e6
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com>
2012-10-29 11:31:26 -07:00
Elliott Hughes
14f19592ae
Fix the pthread_join on self error case.
...
We should return EDEADLK, not deadlock the calling thread.
Change-Id: I1243483f709c11b2a60e41142725c54c7dbfcbc9
2012-10-29 10:19:44 -07:00
Xi Wang
ae8eb74675
Fix a potential NULL pointer dereference in _init_thread().
...
The first NULL pointer check against `attr' suggests that `attr' can
be NULL. Then later `attr' is directly dereferenced, suggesting the
opposite.
if (attr == NULL) {
...
} else {
...
}
...
if (attr->stack_base == ...) { ... }
The public API pthread_create(3) allows NULL, and interprets it as "default".
Our implementation actually swaps in a pointer to the global default
pthread_attr_t, so we don't need any NULL checks in _init_thread. (The other
internal caller passes its own pthread_attr_t.)
Change-Id: I0a4e79b83f5989249556a07eed1f2887e96c915e
Signed-off-by: Xi Wang <xi.wang@gmail.com>
2012-10-29 08:22:13 -07:00
David 'Digit' Turner
c30396f5f2
libc: Fix alphasort() signature (and implementation).
...
The declaration for alphasort() in <dirent.h> used the deprecated:
int alphasort(const void*, const void*);
while both Posix and GLibc use instead:
int alphasort(const struct dirent** a, const struct dirent** b);
See: http://pubs.opengroup.org/onlinepubs/9699919799/functions/alphasort.html
This patch does the following:
- Update the declaration to match Posix/GLibc
- Get rid of the upstream BSD code which isn't compatible with the new
signature.
- Implement a new trivial alphasort() with the right signature, and
ensure that it uses strcoll() instead of strcmp().
- Remove Bionic-specific #ifdef .. #else .. #endif block in
dirent_test.cpp which uses alphasort().
Even through strcoll() currently uses strcmp(), this does the right
thing in the case where we decide to update strcoll() to properly
implement locale-specific ordered comparison.
Change-Id: I4fd45604d8a940aaf2eb0ecd7d73e2f11c9bca96
2012-10-29 07:44:27 -07:00
Elliott Hughes
f93fc10fc4
Upgrade to tzdata2012h.
...
The 2012h release reflects the following changes recently circulated
on the tz mailing list:
[Brazil] Bahia no longer has DST. (Thanks to Kelley Cook.)
[Brazil] Tocantins has DST. (Thanks to Rodrigo Severo.)
[Israel] Israel has new DST rules next year. (Thanks to Ephraim Silverberg.)
[Jordan] Jordan stays on DST this winter. (Thanks to Steffen Thorsen.)
Bug: 7429010
Change-Id: I0ec5fb72343e42f3f79490dfdea5f7f1946ae76f
2012-10-28 11:34:35 -07:00
Elliott Hughes
a811d7a8e6
Upgrade to tzdata2012h.
...
The 2012h release reflects the following changes recently circulated
on the tz mailing list:
[Brazil] Bahia no longer has DST. (Thanks to Kelley Cook.)
[Brazil] Tocantins has DST. (Thanks to Rodrigo Severo.)
[Israel] Israel has new DST rules next year. (Thanks to Ephraim Silverberg.)
[Jordan] Jordan stays on DST this winter. (Thanks to Steffen Thorsen.)
Bug: 7429010
Change-Id: I82f19ce49f944f928b6dd8dc5a893786266e5cb9
2012-10-28 11:33:56 -07:00
Elliott Hughes
063cfb2084
Clean up the implementation of the <dirent.h> functions.
...
Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 16:42:06 -07:00
Elliott Hughes
a7bb83475b
am 85819efe
: am f2b3ac95
: Merge "Fix recovery: don\'t assert if there\'s no tzdata."
...
* commit '85819efe8f771759d12ab86f0bd47ede621dbb7d':
Fix recovery: don't assert if there's no tzdata.
2012-10-25 15:16:44 -07:00
Elliott Hughes
85819efe8f
am f2b3ac95
: Merge "Fix recovery: don\'t assert if there\'s no tzdata."
...
* commit 'f2b3ac9502e08ef53d4eedd7e93ea9a00d185055':
Fix recovery: don't assert if there's no tzdata.
2012-10-25 15:09:29 -07:00
Elliott Hughes
49271d89da
Fix recovery: don't assert if there's no tzdata.
...
Change-Id: I4d808b57c63ec1ccc024da7fd6a65691e0d455c5
2012-10-25 14:56:08 -07:00
Elliott Hughes
0f96dd8dcb
am df7f24f3
: am 7b68e3f7
: Merge "Per-thread -fstack-protector guards for x86."
...
* commit 'df7f24f310ee3ceb1dc9413d59d5a8816eb584ef':
Per-thread -fstack-protector guards for x86.
2012-10-25 12:23:56 -07:00
Elliott Hughes
df7f24f310
am 7b68e3f7
: Merge "Per-thread -fstack-protector guards for x86."
...
* commit '7b68e3f799d87e84c56687033326924fd8fec84c':
Per-thread -fstack-protector guards for x86.
2012-10-25 12:22:34 -07:00
Elliott Hughes
ad88a08631
Per-thread -fstack-protector guards for x86.
...
Based on a pair of patches from Intel:
https://android-review.googlesource.com/#/c/43909/
https://android-review.googlesource.com/#/c/44903/
For x86, this patch supports _both_ the global that ARM/MIPS use
and the per-thread TLS entry (%gs:20) that GCC uses by default. This
lets us support binaries built with any x86 toolchain (right now,
the NDK is emitting x86 code that uses the global).
I've also extended the original tests to cover ARM/MIPS too, and
be a little more thorough for x86.
Change-Id: I02f279a80c6b626aecad449771dec91df235ad01
2012-10-25 12:04:03 -07:00
Elliott Hughes
4cdc426207
am 60c7ac26
: am d0f2b7e7
: Merge "More upstream NetBSD upgrades."
...
* commit '60c7ac262241588f7942ca068f33d706c8fe5cc4':
More upstream NetBSD upgrades.
2012-10-23 17:29:47 -07:00
Elliott Hughes
60c7ac2622
am d0f2b7e7
: Merge "More upstream NetBSD upgrades."
...
* commit 'd0f2b7e7e65f19f978c59abcbb522c08e76b1508':
More upstream NetBSD upgrades.
2012-10-23 17:15:07 -07:00
Elliott Hughes
ab44f52202
More upstream NetBSD upgrades.
...
Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-23 16:05:09 -07:00
Elliott Hughes
217e616772
am 45f07555
: am e3dbe1e3
: Merge "Upgrade more functions to the current upstream NetBSD copy."
...
* commit '45f075556b26cfe91b1b7e1299b54f0328a06acb':
Upgrade more functions to the current upstream NetBSD copy.
2012-10-23 13:58:25 -07:00
Elliott Hughes
45f075556b
am e3dbe1e3
: Merge "Upgrade more functions to the current upstream NetBSD copy."
...
* commit 'e3dbe1e3820d6ab0370566055e9cdc593c5cce48':
Upgrade more functions to the current upstream NetBSD copy.
2012-10-23 13:55:59 -07:00
Elliott Hughes
e8bcca3a2c
Upgrade more functions to the current upstream NetBSD copy.
...
Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 12:29:53 -07:00
Elliott Hughes
1d212fa6eb
am 4280143d
: am fb93e6a5
: Merge "Move setlocale(3) and the wchar stubs over to .cpp."
...
* commit '4280143d371eae2123a5d8c4d8779db159ecd1e2':
Move setlocale(3) and the wchar stubs over to .cpp.
2012-10-22 18:08:54 -07:00
Elliott Hughes
4280143d37
am fb93e6a5
: Merge "Move setlocale(3) and the wchar stubs over to .cpp."
...
* commit 'fb93e6a5b322a87e61de19421a72d6dfcc82b614':
Move setlocale(3) and the wchar stubs over to .cpp.
2012-10-22 18:06:55 -07:00
Elliott Hughes
29c7f0b4d1
Move setlocale(3) and the wchar stubs over to .cpp.
...
Also separate out the C++ files so we can use -Werror on them. I'd
rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us
see which files still need to be sorted into one bucket or the other.
Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-22 17:05:27 -07:00
Elliott Hughes
1d8b87d2b4
am 69ec117b
: am 5a9911e9
: Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
...
* commit '69ec117b22e3e842bff15f54f3e777cdf3206d21':
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
2012-10-22 16:31:29 -07:00
Elliott Hughes
c866dc20bf
am 9d5a96c0
: am 574773b1
: Merge "Clean up warnings in stubs.cpp."
...
* commit '9d5a96c0d9583fe9a02190ba54a855a2dcc87eb9':
Clean up warnings in stubs.cpp.
2012-10-22 16:31:28 -07:00
Elliott Hughes
69ec117b22
am 5a9911e9
: Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
...
* commit '5a9911e94086a15a7f2d5a7c9173847f123a46ea':
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
2012-10-22 16:29:13 -07:00
Elliott Hughes
9d5a96c0d9
am 574773b1
: Merge "Clean up warnings in stubs.cpp."
...
* commit '574773b1eae797e2f7a1d11d0176755d2e74eb41':
Clean up warnings in stubs.cpp.
2012-10-22 16:29:12 -07:00
Elliott Hughes
5a9911e940
Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
2012-10-22 16:13:04 -07:00
Elliott Hughes
ce45fea03d
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
...
Change-Id: I35ceb09fedf873c5e98e1e26efce5e4f00a17e74
2012-10-22 16:10:27 -07:00
Elliott Hughes
6fa26e21bc
Clean up warnings in stubs.cpp.
...
Change-Id: Ie0792846de7cf5f5c72737494bf78ab8dcb8cc3e
2012-10-22 16:04:56 -07:00
Elliott Hughes
8b8cc88d39
am 75f33adc
: am 4e457759
: Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
...
* commit '75f33adcb1f845ae121eb5508b120aaaa9f7a217':
Move the FORTIFY_SOURCE helpers over to .cpp.
2012-10-22 16:00:03 -07:00
Elliott Hughes
75f33adcb1
am 4e457759
: Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
...
* commit '4e457759893a6a6ab4f84a5aea231d0a11c7bb13':
Move the FORTIFY_SOURCE helpers over to .cpp.
2012-10-22 15:57:42 -07:00
Elliott Hughes
4035b7a321
Move the FORTIFY_SOURCE helpers over to .cpp.
...
Change-Id: Ib5067d51b983cac7760c975becce7fe2408ead04
2012-10-22 15:32:01 -07:00
Elliott Hughes
3135c87ca8
am 008744ce
: am df92635a
: Merge "Support zone.tab in bionic, and remove the file format version."
...
* commit '008744cedaa7e3be533bbedb51dd986c6dfea987':
Support zone.tab in bionic, and remove the file format version.
2012-10-22 15:11:07 -07:00
Elliott Hughes
008744ceda
am df92635a
: Merge "Support zone.tab in bionic, and remove the file format version."
...
* commit 'df92635a57e8093d9cbffc38bbf513f3361ee91e':
Support zone.tab in bionic, and remove the file format version.
2012-10-22 15:08:38 -07:00
Elliott Hughes
2393535f0d
Support zone.tab in bionic, and remove the file format version.
...
Bug: 7012465
Change-Id: I6335c91ebadc609fae85bad94db972be7574b6e4
2012-10-22 14:47:58 -07:00
Elliott Hughes
9407c5c126
am 417834b1
: am eb370aa3
: Merge "Make bionic look in /data/misc for tzdata updates."
...
* commit '417834b17ee00a6b1cd4e816f632c3596f3f51c3':
Make bionic look in /data/misc for tzdata updates.
2012-10-22 11:55:42 -07:00
Elliott Hughes
417834b17e
am eb370aa3
: Merge "Make bionic look in /data/misc for tzdata updates."
...
* commit 'eb370aa31dd549ad7a7a2044dedab1140a7aeda9':
Make bionic look in /data/misc for tzdata updates.
2012-10-22 11:53:22 -07:00
Elliott Hughes
1c29572034
Make bionic look in /data/misc for tzdata updates.
...
Bug: 7012465
Change-Id: I4d1018f686f2409600fdb6630732cae33efe8f02
2012-10-22 11:34:05 -07:00
Elliott Hughes
1b62d4e72e
am 629a28cd
: am dc595d83
: Merge "Change ZoneCompator to generate the single "tzdata" file."
...
* commit '629a28cdf384d83a4d433de8e1299b01e42cc75e':
Change ZoneCompator to generate the single "tzdata" file.
2012-10-19 17:24:22 -07:00
Elliott Hughes
421083359e
am 58d08711
: am 7a85c42b
: Merge "Update generate-NOTICE.py to know about tzdata."
...
* commit '58d08711af5e8237d6196652d59cc4e8b8caafcf':
Update generate-NOTICE.py to know about tzdata.
2012-10-19 17:24:21 -07:00
Elliott Hughes
629a28cdf3
am dc595d83
: Merge "Change ZoneCompator to generate the single "tzdata" file."
...
* commit 'dc595d830898e5859bf98d7436af2a777a11f810':
Change ZoneCompator to generate the single "tzdata" file.
2012-10-19 17:21:41 -07:00
Elliott Hughes
58d08711af
am 7a85c42b
: Merge "Update generate-NOTICE.py to know about tzdata."
...
* commit '7a85c42b8f7af801a31208ed83589b5397baee73':
Update generate-NOTICE.py to know about tzdata.
2012-10-19 17:21:40 -07:00
Elliott Hughes
dc595d8308
Merge "Change ZoneCompator to generate the single "tzdata" file."
2012-10-19 17:12:37 -07:00
Elliott Hughes
5b1497acdb
Change ZoneCompator to generate the single "tzdata" file.
...
Also remove the obsolete individual files, and the temporary script
that converted between the formats.
Bug: 7012465
Change-Id: I5a4030098e4d53e747fd6d395df2679d1567ee1f
2012-10-19 15:45:46 -07:00
Elliott Hughes
4612763b44
Update generate-NOTICE.py to know about tzdata.
...
Also regenerate the NOTICE files. One had slipped behind.
Bug: 7012465
Change-Id: Ice2e909b521472eb1acd53d8151038bebe19984a
2012-10-19 14:55:19 -07:00
Elliott Hughes
933746ad7d
am af72df5b
: am e75c273a
: Merge "Track the tzdata2012g update in the new file format."
...
* commit 'af72df5b98944cfb89cecb7abc05bceec0612981':
Track the tzdata2012g update in the new file format.
2012-10-19 14:42:05 -07:00
Elliott Hughes
af72df5b98
am e75c273a
: Merge "Track the tzdata2012g update in the new file format."
...
* commit 'e75c273ac434043153f22b1c2f89c042928407bc':
Track the tzdata2012g update in the new file format.
2012-10-19 14:40:25 -07:00
Elliott Hughes
8af5412efc
Track the tzdata2012g update in the new file format.
...
Change-Id: Id18aeb1122df769d83c4be06fbf37681231e79f0
2012-10-19 14:28:56 -07:00
Elliott Hughes
18ee86f892
am f0af78c2
: am 551ca77e
: Merge "Do all the zoneinfo.* file generation in Java."
...
* commit 'f0af78c27bede71304a894c23fb3100d027fc74b':
Do all the zoneinfo.* file generation in Java.
2012-10-19 13:53:20 -07:00
Elliott Hughes
f0af78c27b
am 551ca77e
: Merge "Do all the zoneinfo.* file generation in Java."
...
* commit '551ca77e35098272abfe9484457827c661d23ef0':
Do all the zoneinfo.* file generation in Java.
2012-10-19 13:51:18 -07:00
Elliott Hughes
c2c2a48845
Upgrade to tzdata2012g.
...
This release reflects the following changes recently circulated on the tz
mailing list:
Samoa fall 2012 and later. (Thanks to Nicholas Pereira
and Robert Elz.)
Palestine fall 2012. (Thanks to Steffen Thorsen.)
This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.
(cherry-pick of f0e402dbd257ab495eab514b347db4b3d6844826.)
Change-Id: I8202292b11accedb811194a821dacf837a1bbd6e
2012-10-19 13:43:10 -07:00
Elliott Hughes
174b6d0e19
am 356c0af6
: am 2266e495
: Merge "Switch bionic over to using libcore\'s copy of libcore.util.ZoneInfo."
...
* commit '356c0af60b83988bdb55970c8f29886a2fa5a672':
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
2012-10-19 13:22:50 -07:00
Elliott Hughes
356c0af60b
am 2266e495
: Merge "Switch bionic over to using libcore\'s copy of libcore.util.ZoneInfo."
...
* commit '2266e4956f4b245903acd66f0cc32ec5caf5abae':
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
2012-10-19 13:18:07 -07:00
Elliott Hughes
328a484588
Do all the zoneinfo.* file generation in Java.
...
Bug: 7012465
Change-Id: Ia5d5ad75db94d680a6b34ccc26eb68d5bd2bfc29
2012-10-19 13:03:52 -07:00
Elliott Hughes
eb06129c5c
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
...
Bug: 7012465
Change-Id: I1225494c5d77a20fd48be1e904d8695ef95860e3
2012-10-19 12:05:24 -07:00
Elliott Hughes
a7bc708e0c
am fb8ecd6e
: am bc77942a
: am f0e402db
: Upgrade to tzdata2012g.
...
* commit 'fb8ecd6e2f20dba3b6eaf0bd6b834c2c072322c5':
Upgrade to tzdata2012g.
2012-10-19 10:02:11 -07:00
Elliott Hughes
fb8ecd6e2f
am bc77942a
: am f0e402db
: Upgrade to tzdata2012g.
...
* commit 'bc77942a9a5b2a30eb04fab495cb30ac21bb150d':
Upgrade to tzdata2012g.
2012-10-19 09:59:52 -07:00
Elliott Hughes
bc77942a9a
am f0e402db
: Upgrade to tzdata2012g.
...
* commit 'f0e402dbd257ab495eab514b347db4b3d6844826':
Upgrade to tzdata2012g.
2012-10-19 09:57:49 -07:00
Elliott Hughes
f0e402dbd2
Upgrade to tzdata2012g.
...
This release reflects the following changes recently circulated on the tz
mailing list:
Samoa fall 2012 and later. (Thanks to Nicholas Pereira
and Robert Elz.)
Palestine fall 2012. (Thanks to Steffen Thorsen.)
This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.
Change-Id: I52d9d2cd6e8e755885dc258200c014bee75527c9
2012-10-18 16:34:48 -07:00
Elliott Hughes
0f7814264c
am 4d71adbc
: am 10225071
: Merge "Fixes x86 build."
...
* commit '4d71adbc0d12e5153f537f84cce8d9686762e5b9':
Fixes x86 build.
2012-10-18 13:58:18 -07:00
Elliott Hughes
4d71adbc0d
am 10225071
: Merge "Fixes x86 build."
...
* commit '102250719f8aff443741e54ba5633c7722544620':
Fixes x86 build.
2012-10-18 13:56:02 -07:00
Elliott Hughes
8b95404d00
Fixes x86 build.
...
Change-Id: I0e576784b2224668d58ebea03986d534ee0e43b4
2012-10-18 13:42:59 -07:00
Elliott Hughes
c0e8400361
am 79c6a8d2
: am ca7466d2
: Merge "Make bionic\'s dependency on the tzdata explicit."
...
* commit '79c6a8d2b163e40eb6f19bbf8f59eb85fb7996e6':
Make bionic's dependency on the tzdata explicit.
2012-10-18 13:40:19 -07:00
Elliott Hughes
79c6a8d2b1
am ca7466d2
: Merge "Make bionic\'s dependency on the tzdata explicit."
...
* commit 'ca7466d2b8ee6baad86afc82fa18cda4d931b6d3':
Make bionic's dependency on the tzdata explicit.
2012-10-18 13:37:54 -07:00
Elliott Hughes
914d8d4cff
Make bionic's dependency on the tzdata explicit.
...
Also stop building the obsolete three files, now bionic and libcore
both use the new single file.
Bug: 7012465
Change-Id: I1b9b49af7382c57b6cb8820c2275e6d4044b2bb6
2012-10-18 12:23:34 -07:00
Elliott Hughes
c63dda22dd
am 1b315363
: am 5ae762a3
: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
...
* commit '1b315363c22fdf53d77fc83ec0bbada32e73ccc7':
Pull bionic's time zone data from the new single 'tzdata' file.
2012-10-18 11:02:01 -07:00
Elliott Hughes
1b315363c2
am 5ae762a3
: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
...
* commit '5ae762a393168932602eb7269a7d30a53de1c83c':
Pull bionic's time zone data from the new single 'tzdata' file.
2012-10-18 10:59:27 -07:00
Elliott Hughes
5ae762a393
Merge "Pull bionic's time zone data from the new single 'tzdata' file."
2012-10-18 10:48:11 -07:00
Elliott Hughes
9648b588b4
am e5c8ced4
: am 9ffaabcc
: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
...
* commit 'e5c8ced4f95e97b2fadc0c64fbdbeeb023677035':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
2012-10-18 10:28:52 -07:00
Elliott Hughes
e5c8ced4f9
am 9ffaabcc
: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
...
* commit '9ffaabcc49776676cb2ea60f0846f2c208f6d715':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
2012-10-18 10:26:36 -07:00
Elliott Hughes
9ffaabcc49
Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
2012-10-18 10:09:47 -07:00
Elliott Hughes
d23af23268
Pull bionic's time zone data from the new single 'tzdata' file.
...
Bug: 7012465
Change-Id: Iec71e448bf7a40af30ca89150b3c336e67a44a43
2012-10-17 16:30:47 -07:00
Elliott Hughes
f190a16e5e
am c2e4c310
: am 32ea9fe5
: Merge "Put all the tzdata in one file."
...
* commit 'c2e4c310ff9ace06be0376d649a09abb51813981':
Put all the tzdata in one file.
2012-10-17 16:12:19 -07:00
Elliott Hughes
c2e4c310ff
am 32ea9fe5
: Merge "Put all the tzdata in one file."
...
* commit '32ea9fe5783e3cc9756205c0ac46482afc700a3d':
Put all the tzdata in one file.
2012-10-17 16:09:31 -07:00
Elliott Hughes
fb018a2dde
Put all the tzdata in one file.
...
I'll come back and remove the separate files (and change the regular 'generate'
script) when the separate files are obsolete, but in the interim period, it's
easier to have both old and new files available.
Bug: 7012465
Change-Id: I36e2fd49c08ff79ded6eca1c5bc4c08837cc490a
2012-10-17 14:24:50 -07:00
Elliott Hughes
ead7819f51
Remove obsolete CHANGES.TXT and ISSUES.TXT.
...
These haven't been updated in a long time, and "git log" is the source of truth.
Change-Id: I99036f6111e53425f32df510b7b717deb77513a5
2012-10-17 11:33:59 -07:00
Elliott Hughes
9eaa953642
am 06abe13c
: am a2f596b6
: Merge "Make dlerror(3) thread-safe."
...
* commit '06abe13c5f7a318eef316268d0d25d92ff128c19':
Make dlerror(3) thread-safe.
2012-10-17 11:05:19 -07:00
Elliott Hughes
06abe13c5f
am a2f596b6
: Merge "Make dlerror(3) thread-safe."
...
* commit 'a2f596b65075db7916ffffa2f5059e7953719578':
Make dlerror(3) thread-safe.
2012-10-17 11:03:12 -07:00
David 'Digit' Turner
826215bec2
am c7dc8425
: am 42ac0e50
: Merge "Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>""
...
* commit 'c7dc842529ea6f8801164eb8b4f7d036acc53955':
Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
2012-10-17 10:32:36 -07:00
David 'Digit' Turner
c7dc842529
am 42ac0e50
: Merge "Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>""
...
* commit '42ac0e50302c4d5ce855444e44615489ab662452':
Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
2012-10-17 10:30:01 -07:00
David 'Digit' Turner
c1b44ecc53
Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
...
This creates build issues in the internal Android tree.
Will investigate later.
Original patch: https://android-review.googlesource.com/#/c/38875/
Change-Id: I12c5995ebf172890051af42a5d3b31014c9c5117
2012-10-17 19:10:11 +02:00
David 'Digit' Turner
87f487f6ce
am 423a0740
: am 4136c3a2
: Merge "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
...
* commit '423a0740b536f688b0c1866437dfe59e06413435':
libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>
2012-10-17 07:34:57 -07:00
David 'Digit' Turner
423a0740b5
am 4136c3a2
: Merge "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
...
* commit '4136c3a2b7f7546968c5a305aa2ef0663fcb6c6d':
libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>
2012-10-17 07:32:56 -07:00
David 'Digit' Turner
c124baaf29
libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>
...
This patch updates the C library headers to provide ucontext_t
definitions for three architectures.
+ Fix <signal.h> to always define 'struct sigcontext'.
The new declarations are announced with new macros defined in
<sys/cdefs.h> in order to make it easier to adapt client code
that already defines its own, incompatible, versions of the
structures seen here.
http://code.google.com/p/android/issues/detail?id=34784
Change-Id: Ie78c48690a4ce61c50593f6c39639be7fead3596
2012-10-17 15:59:23 +02:00
Elliott Hughes
5419b94747
Make dlerror(3) thread-safe.
...
I gave up trying to use the usual thread-local buffer idiom; calls to
calloc(3) and free(3) from any of the "dl" functions -- which live in
the dynamic linker -- end up resolving to the dynamic linker's stubs.
I tried to work around that, but was just making things more complicated.
This alternative costs us a well-known TLS slot (instead of the
dynamically-allocated TLS slot we'd have used otherwise, so no difference
there), plus an extra buffer inside every pthread_internal_t.
Bug: 5404023
Change-Id: Ie9614edd05b6d1eeaf7bf9172792d616c6361767
2012-10-16 17:58:17 -07:00
Elliott Hughes
2734345095
am ee7a28c5
: am a9944cfe
: Merge "LONG_LONG_MIN/MAX: Move declarations to <limits.h>"
...
* commit 'ee7a28c529dad9f51aa86271350a4e2d7cddc9d4':
LONG_LONG_MIN/MAX: Move declarations to <limits.h>
2012-10-15 20:25:32 -07:00
Elliott Hughes
ee7a28c529
am a9944cfe
: Merge "LONG_LONG_MIN/MAX: Move declarations to <limits.h>"
...
* commit 'a9944cfe9e152ca46afb0a77300ec5a2a1a24e64':
LONG_LONG_MIN/MAX: Move declarations to <limits.h>
2012-10-15 20:20:50 -07:00
David 'Digit' Turner
f8a2c51bf3
LONG_LONG_MIN/MAX: Move declarations to <limits.h>
...
LONG_LONG_MIN, LONG_LONG_MAX and ULONG_LONG_MAX are
GLibc-specific macros that are better defined in <limits.h>
instead of the current exotic location (<pthread.h>).
Note that GCC's <limits.h> only defines these macros
when __GNU_LIBRARY__ is also defined. This is only the
case when building against GLibc, so manually redefine
the macros here.
Note that using LLONG_MIN/LLONG_MAX/ULLONG_MAX is the
C99-compliant way to get these values, but it's easier
to define these compatibility macros for the sake of
porting existing code.
Change-Id: I8023918d73b4685238054932f94a4006c1ca7d03
2012-10-15 18:52:55 +02:00
Elliott Hughes
b2d2b30a13
am 1452324f
: am fcf901d5
: Merge "Fix realloc(3) when chk_malloc debugging is on."
...
* commit '1452324ff551f3aa7f9d61186d3b9cb04f7e9d39':
Fix realloc(3) when chk_malloc debugging is on.
2012-10-12 17:15:39 -07:00
Elliott Hughes
1452324ff5
am fcf901d5
: Merge "Fix realloc(3) when chk_malloc debugging is on."
...
* commit 'fcf901d5c0924a71a1405a2535051663281da048':
Fix realloc(3) when chk_malloc debugging is on.
2012-10-12 17:14:29 -07:00
Elliott Hughes
e7e274b13a
Fix realloc(3) when chk_malloc debugging is on.
...
The tests for a NULL pointer and size 0 were the wrong way round.
From Intel's patch 9cae4f2ffc4778ed82be04711d8775a84092d4e2.
Change-Id: I118aff3358aa5f34126d74bfaa43f6e2f1a89055
2012-10-12 17:05:05 -07:00
Elliott Hughes
66d71c8f13
am ab4e2ed1
: am db4fdf1a
: Merge "Fix dlerror(3)."
...
* commit 'ab4e2ed182011998751ff5d6c321ff5bae20c6cd':
Fix dlerror(3).
2012-10-12 10:49:08 -07:00
Elliott Hughes
ab4e2ed182
am db4fdf1a
: Merge "Fix dlerror(3)."
...
* commit 'db4fdf1aafb63b09ee967066d9b8107a9812db2d':
Fix dlerror(3).
2012-10-12 10:47:59 -07:00
Elliott Hughes
3b297c4079
Fix dlerror(3).
...
Add unit tests for dlerror(3) in various situations. I think We're at least
as good as glibc now.
Also factor out the ScopedPthreadMutexLock and use it here too.
Bug: http://code.google.com/p/android/issues/detail?id=38398
Change-Id: I040938b4366ab836e3df46d1d8055b92f4ea6ed8
2012-10-11 16:08:51 -07:00
Elliott Hughes
f0f052f28d
am 2facd5b5
: am 417fd233
: Merge "Fix perf_event_open syscall for x86 and mips"
...
* commit '2facd5b5ef3e52b11590b4de01e17f6923a85aee':
Fix perf_event_open syscall for x86 and mips
2012-10-11 10:43:49 -07:00
Elliott Hughes
2facd5b5ef
am 417fd233
: Merge "Fix perf_event_open syscall for x86 and mips"
...
* commit '417fd2334a694cf6a831b81cd672b4ca31ff2f54':
Fix perf_event_open syscall for x86 and mips
2012-10-11 10:42:00 -07:00
Shuo Gao
4e75c4b2d7
Fix perf_event_open syscall for x86 and mips
...
perf_event_open syscall has a different syscall number for
the 3 supported architectures: arm, x86 and mips. Currenlty
only the arm syscall number is defined for all architectures.
Tracing tools like perf will not work on other architectures
than arm.
Add the different values for perf_event_open on x86 and mips
and run gensyscalls.py to update generated headers.
Change-Id: I2ed78bd42c0e5df8dbc51d784be49cccda5fab30
Author: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
2012-10-11 10:24:51 -07:00
Elliott Hughes
c41e2216f4
am 4c3d7a86
: am 1ceb9824
: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
...
* commit '4c3d7a86bb568e0b3fa5c9e24d32fa1ee9404b2e':
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
2012-10-09 18:29:25 -07:00
Elliott Hughes
4c3d7a86bb
am 1ceb9824
: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
...
* commit '1ceb9824ab39501e98300bc87f7984ee6b455ce8':
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
2012-10-09 18:27:11 -07:00
Elliott Hughes
1ceb9824ab
Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
2012-10-09 18:14:37 -07:00
Elliott Hughes
5a16e92eb5
am c7f654df
: am b83cad79
: Merge "Fix two comment typos."
...
* commit 'c7f654dffea47a80ba566cd05f9212c8c7359a67':
Fix two comment typos.
2012-10-09 17:39:51 -07:00
Elliott Hughes
c7f654dffe
am b83cad79
: Merge "Fix two comment typos."
...
* commit 'b83cad79838f780779bd129da9ed4662b741bd31':
Fix two comment typos.
2012-10-09 17:38:01 -07:00
Elliott Hughes
e5d5f7f0d8
Fix two comment typos.
...
Change-Id: Icb2d6f7fa97ef5a4409a7606875e416cfab0a4b3
2012-10-09 17:23:09 -07:00
Elliott Hughes
156da96621
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
...
The getcwd(3) bug was found by valgrind.
Bug: 7291287
Change-Id: I59f3bff1c1392a408b905934eebcd5d894d37492
2012-10-09 17:17:24 -07:00
Naseer Ahmed
2d5d80985e
am 9c389255
: am 6b1ba118
: am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '9c3892558f68ec8791283844e2d7d7326bcd3574':
bionic: update processed msm_mdp.h
2012-10-03 01:05:02 -07:00
Naseer Ahmed
9c3892558f
am 6b1ba118
: am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '6b1ba1184a5e0884686b63da837a85f8c861d1fc':
bionic: update processed msm_mdp.h
2012-10-03 01:03:04 -07:00
Naseer Ahmed
6b1ba1184a
am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '3ef4fecd30c22f3c17c1dadfce4527e858b42e7e':
bionic: update processed msm_mdp.h
2012-10-03 00:57:49 -07:00
Naseer Ahmed
3ef4fecd30
bionic: update processed msm_mdp.h
...
-- Has display commit ioctl
Bug: 7274951
Change-Id: If2d47edf3ada418e8c61a2acc7b79fb3422f3473
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 23:37:34 -07:00
Andreas Huber
ae554abd41
am 3a0aa5e0
: am cafbc940
: am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit '3a0aa5e0a01c26278438513a73bc0150d5fc215c':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:44:32 -07:00
Andreas Huber
3a0aa5e0a0
am cafbc940
: am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit 'cafbc9404310828ecddc55a1eed5fc897008b1f3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:42:35 -07:00
Andreas Huber
cafbc94043
am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit '2e0452cbd1f5b981fbadb4021198d2c27ec1cde3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:40:02 -07:00
Andreas Huber
2e0452cbd1
bionic: update processed msm_vidc_enc.h
...
Updated kernel headers to support a video encoder ioctl to preprend each IDR
frame with SPS/PPS.
related-to-bug: 7245308
Change-Id: I7244c521690d69a905deb19940a04fd4f2e06935
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 14:34:03 -07:00
Elliott Hughes
f0a9cd7847
am 92e6de6f
: am b95ad82f
: am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit '92e6de6f940fee6362dd306ad77c6d7bfa56e4cb':
Fix MIPS build.
2012-10-02 11:34:14 -07:00
Elliott Hughes
92e6de6f94
am b95ad82f
: am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit 'b95ad82f7d175a4f79eb0cbf6caedf0653603590':
Fix MIPS build.
2012-10-02 11:33:03 -07:00
Elliott Hughes
857fed50cb
Fix MIPS build.
...
ARM and x86 have custom memcpy implementations, but MIPS relies on the generic
one, which I recently moved.
Change-Id: I9e49243f63b27a4123f2c6623d6286ec82d333c7
2012-10-02 11:20:07 -07:00
Elliott Hughes
6cdf8dd025
am 80a29832
: am 90172541
: am b98204a9
: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit '80a298327299aa28b564941f90818911023ae544':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:28:31 -07:00
Elliott Hughes
80a2983272
am 90172541
: am b98204a9
: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit '90172541866696a5a46fae7ff7e186126ee37318':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:25:12 -07:00
Elliott Hughes
b98204a9fb
Merge "Move non-upstream code into the libc/bionic directory."
2012-10-02 09:13:34 -07:00
Elliott Hughes
95114ff5c5
am 15edd80a
: am 39d7c607
: am 75f43525
: Merge "Always take GCC\'s definition of NULL."
...
* commit '15edd80a696c1b5243874f7db9ef2d753016ade8':
Always take GCC's definition of NULL.
2012-10-01 18:23:31 -07:00
Elliott Hughes
15edd80a69
am 39d7c607
: am 75f43525
: Merge "Always take GCC\'s definition of NULL."
...
* commit '39d7c6072dc4d587c32405f3c7de12e60559cfc8':
Always take GCC's definition of NULL.
2012-10-01 18:21:35 -07:00
Elliott Hughes
7d56ccbfaa
Always take GCC's definition of NULL.
...
There's a (bad) definition of NULL in <linux/stddef.h>, and this
definition of NULL, and the One True definition in the <stddef.h> provided
by the compiler. This change at least kills one of the bad duplicates.
Killing the <linux/stddef.h> one is harder, because it's in a generated
file.
Change-Id: Iea4ccb12d6758199f312ea9cd753b84322d5c471
2012-10-01 17:56:58 -07:00
Elliott Hughes
a89864a20b
Move non-upstream code into the libc/bionic directory.
...
I'll need at least one more pass, because there's some upstream code
lurking in libc/bionic, but this is still a step in the right direction.
Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-01 17:35:49 -07:00
Elliott Hughes
be02504f5f
am baa7ee03
: am bb7dfcd3
: am d3bf954e
: Merge "Remove useless #defines and incorrect claims from header files."
...
* commit 'baa7ee0370fcb88625a666141431a4187c0f91b2':
Remove useless #defines and incorrect claims from header files.
2012-10-01 15:54:48 -07:00
Elliott Hughes
baa7ee0370
am bb7dfcd3
: am d3bf954e
: Merge "Remove useless #defines and incorrect claims from header files."
...
* commit 'bb7dfcd3b8744fdf37857375ffe279d2b87a8b22':
Remove useless #defines and incorrect claims from header files.
2012-10-01 15:52:56 -07:00
Elliott Hughes
0cc0d250fd
Remove useless #defines and incorrect claims from header files.
...
The various __need_* macros were write-only.
Change-Id: Id3cca34188e0801fdf93a038b22f2817226ad9c2
2012-10-01 15:12:40 -07:00
Elliott Hughes
b5d5173139
am a54d08a7
: am a428bc12
: am fe712e6c
: Merge "Upgrade seed48 too."
...
* commit 'a54d08a7c15e15f24d94ca6fb97329134d4441a2':
Upgrade seed48 too.
2012-10-01 14:48:57 -07:00
Elliott Hughes
a54d08a7c1
am a428bc12
: am fe712e6c
: Merge "Upgrade seed48 too."
...
* commit 'a428bc1288e28a05b036597db4f0409fa7f3923d':
Upgrade seed48 too.
2012-10-01 14:47:52 -07:00
Elliott Hughes
b28c547aa4
am 6ed5bc12
: am b650111a
: am cd195eba
: Merge "Upgrade to the current NetBSD rand implementation."
...
* commit '6ed5bc12dac544004f8e79b6393b2a8e260a7cc1':
Upgrade to the current NetBSD rand implementation.
2012-10-01 14:16:53 -07:00
Elliott Hughes
6ed5bc12da
am b650111a
: am cd195eba
: Merge "Upgrade to the current NetBSD rand implementation."
...
* commit 'b650111a11b84d7c91145c4f29b58b5742afa572':
Upgrade to the current NetBSD rand implementation.
2012-10-01 14:15:36 -07:00
Elliott Hughes
31a1060a5a
Upgrade seed48 too.
...
Missed this in 774c7f54ff
.
Change-Id: Ic24fd67f003d0e2d192cfb08f96f63024ca817eb
2012-10-01 14:14:21 -07:00
Elliott Hughes
774c7f54ff
Upgrade to the current NetBSD rand implementation.
...
Also add basic unit tests.
Change-Id: I7fc7ef61d47c1e8fdf8b8eff67a635220c3afd56
2012-10-01 13:53:41 -07:00
Saurabh Shah
04373fe6fe
am c556da9e
: am 204b26b4
: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit 'c556da9ed7b0142523d349e7af8ba6492b98a683':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 15:52:50 -07:00
Saurabh Shah
c556da9ed7
am 204b26b4
: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 15:00:03 -07:00
Saurabh Shah
52b4ccbc49
am 204b26b4
: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 14:59:36 -07:00
Saurabh Shah
204b26b440
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
This change adds msm_mdp.h header changes to bionic.
This IOCTL is a substitute for PAN on external panel. It waits for DMAE to
finish before returning and avoid delays in the PAN path.
Bug: 7249589
Acked-by: Arun Kumar K.R <akumarkr@codeaurora.org>
Change-Id: I4b04a4538919ffcb994699a432c4322e9f94e870
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-28 13:46:13 -07:00
Elliott Hughes
326e4037e9
am 8e1a87b5
: am bb892a1b
: am d03bfe68
: Merge "Define ssize_t if necessary."
...
* commit '8e1a87b5470d0708b0503c3a33580e1782e2bda2':
Define ssize_t if necessary.
2012-09-28 10:31:09 -07:00
Elliott Hughes
8e1a87b547
am bb892a1b
: am d03bfe68
: Merge "Define ssize_t if necessary."
...
* commit 'bb892a1b63a2e88c98a2ba31aa659b7efac44e4f':
Define ssize_t if necessary.
2012-09-28 10:28:30 -07:00
Elliott Hughes
422b6ef92c
Define ssize_t if necessary.
...
Change-Id: I63801cc1f09be5e4ca20a6da7ec3366ba6441afd
2012-09-28 10:15:52 -07:00
Elliott Hughes
2e223d208f
am fb1e192e
: am 72b08af3
: am f9163dd1
: Merge "Add getdelim(3) and getline(3) to bionic"
...
* commit 'fb1e192e12fb4047bf5f01ccf0fd4e5644743adb':
Add getdelim(3) and getline(3) to bionic
2012-09-28 09:57:11 -07:00
Elliott Hughes
fb1e192e12
am 72b08af3
: am f9163dd1
: Merge "Add getdelim(3) and getline(3) to bionic"
...
* commit '72b08af300703a08bf2081304ab81b9e4dba003c':
Add getdelim(3) and getline(3) to bionic
2012-09-28 09:55:02 -07:00
Irina Tirdea
eac9eb462e
Add getdelim(3) and getline(3) to bionic
...
Some userspace programs (e.g. perf) need getline.
Changes:
() add getdelim.c, getline.c from NetBSD (http://netbsd.org/ ) under the
NetBSD Foundation's (TNF) license ("2 clause" Berkeley-style license).
() add stub for reentrant.h header that is needed by getdelim.c
() add tests for getdelim(3) and getline(3).
() update NOTICE file.
Change-Id: I22ed82dd5904b9d7a3695535c04f502be3c27c5d
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-27 11:38:57 -07:00
Elliott Hughes
4137d67cde
am 209d67d4
: am fd6ca57f
: am e4030e0b
: Merge "Fix several compiler warnings."
...
* commit '209d67d448a64d147521b3d2efb3efa392dd3ccd':
Fix several compiler warnings.
2012-09-26 16:09:26 -07:00
Elliott Hughes
209d67d448
am fd6ca57f
: am e4030e0b
: Merge "Fix several compiler warnings."
...
* commit 'fd6ca57f24cbfd8a8074ee6f1c22dd973f1b172f':
Fix several compiler warnings.
2012-09-26 16:07:02 -07:00
Elliott Hughes
e4030e0bfc
Merge "Fix several compiler warnings."
2012-09-26 15:51:01 -07:00
Elliott Hughes
6a3d9af46e
am bdc51470
: am 2c29bcf7
: am 827a2604
: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
...
* commit 'bdc514700d9f766f5a44a95bb80dab15846bd1c4':
Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h
2012-09-26 15:20:38 -07:00
Elliott Hughes
bdc514700d
am 2c29bcf7
: am 827a2604
: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
...
* commit '2c29bcf77f0d7dd7fce284ac0c17ff12663413d0':
Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h
2012-09-26 15:19:22 -07:00
Elliott Hughes
827a2604ee
Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
2012-09-26 14:58:11 -07:00
Elliott Hughes
ac184b2142
Fix several compiler warnings.
...
Change-Id: I55caa50a5937442734f4fcbdb4edf1c70f335bf8
2012-09-26 14:20:22 -07:00
Elliott Hughes
0a2d31838f
am 66569e3d
: am a48d5e5f
: am 855dde44
: Merge "Fix tmpfile(3)."
...
* commit '66569e3d53643fe4682091c4e11c25449e9b7fdc':
Fix tmpfile(3).
2012-09-26 12:21:02 -07:00
Elliott Hughes
66569e3d53
am a48d5e5f
: am 855dde44
: Merge "Fix tmpfile(3)."
...
* commit 'a48d5e5f127df0f76b49e046be042f46f211e8bc':
Fix tmpfile(3).
2012-09-26 12:19:33 -07:00
Elliott Hughes
855dde4426
Merge "Fix tmpfile(3)."
2012-09-26 12:04:59 -07:00
Elliott Hughes
91875dcd6e
Fix tmpfile(3).
...
This could be better, but at least now it works.
Change-Id: I88b7cf3f7ce8e5fa0b3fe678b7d1679a68ffffc9
2012-09-26 12:02:17 -07:00
Nick Kralevich
0147bd2f78
am 06abf4ed
: am 5989ed5c
: am 25937d36
: Merge "FORTIFY_SOURCE: add umask check"
...
* commit '06abf4edbf4b6d10ee82369ed48b8145a94ba1aa':
FORTIFY_SOURCE: add umask check
2012-09-26 11:15:38 -07:00
Nick Kralevich
06abf4edbf
am 5989ed5c
: am 25937d36
: Merge "FORTIFY_SOURCE: add umask check"
...
* commit '5989ed5cb8a1d11c140aa61a718e386c2cc88307':
FORTIFY_SOURCE: add umask check
2012-09-26 11:14:12 -07:00
Nick Kralevich
cd587701c8
FORTIFY_SOURCE: add umask check
...
Verify that the call to umask makes sense. While this wouldn't
have detected bug 7094213 (because the low order bits were all zero),
it might detect other similar bugs.
References: https://code.google.com/p/android-source-browsing/source/detail?r=acba45cc4b1f98f67fcdeda2f7c13ed57659b92a&repo=platform--libcore
Change-Id: I966a531d6b3cf8e1c5eacd69bd3cbec475b5fa58
2012-09-26 10:19:31 -07:00
Raghu Gandham
0e77287209
Replace __unused in kernel headers with __linux_unused to avoid
...
conflicts with __unused macro in sys/cdefs.h
Change-Id: Ice664397e0b7c7a90795012f30be5e43a9675525
2012-09-25 17:54:43 -07:00
Elliott Hughes
a638642f44
am 354867d7
: am 0eb4f255
: am 6e0e03c3
: Merge "Add the cleaned kernel headers"
...
* commit '354867d7020d4c7fb001c659245b60bff82a1a32':
Add the cleaned kernel headers
2012-09-24 13:52:05 -07:00
Elliott Hughes
354867d702
am 0eb4f255
: am 6e0e03c3
: Merge "Add the cleaned kernel headers"
...
* commit '0eb4f255d2dc1778b9a5fabb0f65c81ac4dad4a4':
Add the cleaned kernel headers
2012-09-24 13:50:04 -07:00
Elliott Hughes
51d1a14c80
am a06e11cc
: am c746bed8
: am 7b0377ed
: Merge "[MIPS] Removed the unused header"
...
* commit 'a06e11cc34612ef814a0f73bccdd43059111a735':
[MIPS] Removed the unused header
2012-09-24 13:43:59 -07:00
Elliott Hughes
a06e11cc34
am c746bed8
: am 7b0377ed
: Merge "[MIPS] Removed the unused header"
...
* commit 'c746bed88931fab8abcc4d01a5c53b95fff1ba8f':
[MIPS] Removed the unused header
2012-09-24 13:40:53 -07:00
Raghu Gandham
bfeb8a98b6
Add the cleaned kernel headers
...
Change-Id: Ied4e3ca765672ebaebe9d4d0909b3278c2ff3cd8
2012-09-24 12:33:57 -07:00
Raghu Gandham
d769826b0d
[MIPS] Removed the unused header
...
Change-Id: I8756a862669d4e5f283945496983f11a59dea30c
2012-09-24 11:52:00 -07:00
Elliott Hughes
f4b34b6c39
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
This reverts commit 3a936a4980
.
We don't want this in jb-mr1.
2012-09-24 10:13:12 -07:00
Elliott Hughes
c08088376a
am 82ec6850
: am 6c0e373d
: am ec432608
: am 0c24effd
: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '82ec685054bd14e596fcb0661c7f5c398743b4b3':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:48:35 -07:00
Elliott Hughes
9f3c0d32a4
am 6da07f02
: am ecf67e15
: am 2d51dddf
: am 85049ead
: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '6da07f02bd064cfae852df2b8ac82203432aef35':
Use hidden visibility for several internal-use-only functions.
2012-09-24 09:48:34 -07:00
Elliott Hughes
2b83e0e67e
am 0349e3d3
: am d2eea0e6
: am baa74eff
: am 882c6af9
: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit '0349e3d3ffa411ffd47f005af7f9c5585e469165':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 09:48:33 -07:00
Elliott Hughes
6c0e373d38
am ec432608
: am 0c24effd
: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'ec4326084ed2a717b3e318f36c2675ef033c30ff':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:40:18 -07:00
Naseer Ahmed
f9355bc5cd
am 21e0a7ee
: am f7070074
: bionic: Update MDP header for sync
...
* commit '21e0a7ee8bd9862452a429cef554f31e3c379903':
bionic: Update MDP header for sync
2012-09-24 09:36:43 -07:00
Elliott Hughes
ecf67e152a
am 2d51dddf
: am 85049ead
: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '2d51dddf1a649c73f207ecf48d419fea8a8ed4de':
Use hidden visibility for several internal-use-only functions.
2012-09-24 08:52:15 -07:00
Elliott Hughes
d2eea0e6d6
am baa74eff
: am 882c6af9
: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit 'baa74eff0dd56b1dbf8e8a233a82e6382828ad72':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 08:52:14 -07:00
Elliott Hughes
0c24effd01
Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 08:41:55 -07:00
Elliott Hughes
95a7a64ac8
Use hidden visibility for several internal-use-only functions.
...
Change-Id: Ibeea6963ff0cc06479d0a3ed7e868eeece8c55a0
2012-09-21 18:27:40 -07:00
Raghu Gandham
988ff8ff9f
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS.
...
Some of the required structure definitons are defined under this macro.
Change-Id: I7a9a986e371381697dcb56bd8ea362856ffa7509
2012-09-21 17:14:05 -07:00
Naseer Ahmed
f707007435
bionic: Update MDP header for sync
...
Change-Id: I5e13cdc9132fd99b8072b2e0836b9a92bc54f9c3
2012-09-20 18:29:45 -07:00
Rebecca Schultz Zavin
e06f77dce0
am 27cfd6af
: am a9dca773
: Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
* commit '27cfd6afd4039a72e3669a2ff32685e81dd455aa':
Update ion header to add FLAG_CACHED_NEEDS_SYNC
2012-09-20 15:46:02 -07:00
Rebecca Schultz Zavin
a9dca77315
Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
Bug: 6854979
Change-Id: Ic94c1b7b10ab750a6b4b0db83d2fb1fa073d91b9
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-09-20 09:47:37 -07:00
Iliyan Malchev
dcc80e127c
am e5521822
: am 4430aa6a
: Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
...
* commit 'e55218223b070d5745dc73c5593c436277c5b9c0':
Update headers for Adreno graphics driver
2012-09-19 15:18:52 -07:00
Jeff Boody
02e06782fc
Update headers for Adreno graphics driver
...
Change-Id: Ic66de698667c8c8607b2c19712a8626a4651da7f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-18 19:52:01 -07:00
Dave Burke
88f1ea8f82
Make pthread_create more forgiving of invalid sched_policy.
...
Bug: 7005326
(cherry-pick of e58303249b9e799a4fe84c5a2dfe71518441a6ec.)
Change-Id: Ie81494e0f6a71caa6fd9fabbcfc47a23077554d6
2012-09-18 16:55:24 -07:00
Dave Burke
5c5b720d81
am baa09d1e
: am e5830324
: Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
...
* commit 'baa09d1e0a408d410fc5a834fe9c283ae589ff13':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 00:10:52 -07:00
Dave Burke
e58303249b
Make pthread_create more forgiving of invalid sched_policy.
...
Bug: 7005326
Change-Id: I4e33d8e7d70fbfcf8a1bcc0e4c33279b42092a0a
2012-09-17 21:55:24 -07:00
Elliott Hughes
41bb2eb806
am 1f1e7b70
: am 2aceb4bc
: am e2a17ef4
: am 77ac158e
: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
...
* commit '1f1e7b70b7e37039ce53aed8b1b651c8692347e7':
Don't copy strerror(3) or strsignal(3) strings if we can share.
2012-09-17 16:00:07 -07:00
Elliott Hughes
2aceb4bcb3
am e2a17ef4
: am 77ac158e
: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
...
* commit 'e2a17ef444e1d3b3e27e649440a320139038d1d9':
Don't copy strerror(3) or strsignal(3) strings if we can share.
2012-09-17 15:53:22 -07:00
Elliott Hughes
77ac158e90
Merge "Don't copy strerror(3) or strsignal(3) strings if we can share."
2012-09-17 15:36:27 -07:00
Elliott Hughes
4198fa4c23
Don't copy strerror(3) or strsignal(3) strings if we can share.
...
Change-Id: Ic405269f63b945c6fb347e7c4346cd6f104aff35
2012-09-17 15:23:35 -07:00
Elliott Hughes
7379f525be
am 469bd669
: am 4b3ff1f0
: am f8902bf7
: am 047a285d
: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
...
* commit '469bd6692b984cfbecc96522960bb83baf7c9131':
Fix <sys/klog.h> to correspond to the kernel operations.
2012-09-17 12:45:38 -07:00