Elliott Hughes
fd78965e84
am a08be021
: am 57e55fe3
: am fd152c31
: Merge "Clean up some comments."
...
* commit 'a08be021ccaf81bcbc53553c2f822730124c3d5e':
Clean up some comments.
2013-10-01 20:59:34 -07:00
Elliott Hughes
3bd92e83ad
am d4e69610
: am 1a46de67
: am f281fd02
: Merge "Better statfs/fstatfs glibc compatibility."
...
* commit 'd4e6961041942c6c01e6205db7d81368b39a4d1e':
Better statfs/fstatfs glibc compatibility.
2013-10-01 20:59:28 -07:00
Elliott Hughes
a8354c16ef
am 58413fe7
: am 4b5a0e1a
: am 693bd73f
: Merge "Remove 32-bit assumptions from the ELF code."
...
* commit '58413fe73561e8f230092a2b83db64e58fcb061d':
Remove 32-bit assumptions from the ELF code.
2013-10-01 20:59:28 -07:00
Elliott Hughes
b3a045c79e
am 6c8dc464
: am 28317d3a
: am f5ea738b
: Merge "Fix x86 build."
...
* commit '6c8dc464068816986278d152a7c39d477924b360':
Fix x86 build.
2013-10-01 18:46:33 -07:00
Elliott Hughes
8182c3ee60
am 5d641bcf
: am f5dcdfc4
: am 6dee3b9a
: Merge "Add x86_64 to the bionic headers."
...
* commit '5d641bcf70d36caa22ff2c7d3e3f252abf541bed':
Add x86_64 to the bionic headers.
2013-10-01 18:46:32 -07:00
Elliott Hughes
e770243df2
am b2775090
: am 34284954
: am 76218efb
: Merge "Fix inttypes.h and stdint.h for 64-bit (and C++11)."
...
* commit 'b27750909579926ad8154218b53f4d1765db7d28':
Fix inttypes.h and stdint.h for 64-bit (and C++11).
2013-10-01 18:45:53 -07:00
Christopher Ferris
081f6762e4
am a59e16ba
: am 34c2a9fc
: Move stack unwinding test into library.
...
* commit 'a59e16bac971db7bb8e65e63d90e895bf4731747':
2013-10-01 18:45:50 -07:00
Elliott Hughes
a08be021cc
am 57e55fe3
: am fd152c31
: Merge "Clean up some comments."
...
* commit '57e55fe3b32465023071a19e368d91f4804ade3b':
Clean up some comments.
2013-10-01 11:14:27 -07:00
Elliott Hughes
57e55fe3b3
am fd152c31
: Merge "Clean up some comments."
...
* commit 'fd152c31586a1f5e6763b06f1182ccd72cb86b69':
Clean up some comments.
2013-10-01 11:12:09 -07:00
Elliott Hughes
fd152c3158
Merge "Clean up some comments."
2013-10-01 18:10:54 +00:00
Elliott Hughes
c0af695426
Clean up some comments.
...
Copyright headers shouldn't contain the filename (and especially
shouldn't contain a different file's filename).
Change-Id: I82690a3bf371265402bc16f5d2fbb9299c3a1926
2013-10-01 11:10:21 -07:00
Elliott Hughes
d4e6961041
am 1a46de67
: am f281fd02
: Merge "Better statfs/fstatfs glibc compatibility."
...
* commit '1a46de67b3f78ce44ddf622bcf5918fe758dd4d4':
Better statfs/fstatfs glibc compatibility.
2013-10-01 10:04:30 -07:00
Elliott Hughes
58413fe735
am 4b5a0e1a
: am 693bd73f
: Merge "Remove 32-bit assumptions from the ELF code."
...
* commit '4b5a0e1ad76d76d6a8793f61e3c0902ea4628ce7':
Remove 32-bit assumptions from the ELF code.
2013-10-01 10:04:29 -07:00
Elliott Hughes
1a46de67b3
am f281fd02
: Merge "Better statfs/fstatfs glibc compatibility."
...
* commit 'f281fd02e9eebea3de9c07412c5b66647ca0c290':
Better statfs/fstatfs glibc compatibility.
2013-10-01 10:02:16 -07:00
Elliott Hughes
4b5a0e1ad7
am 693bd73f
: Merge "Remove 32-bit assumptions from the ELF code."
...
* commit '693bd73fcdf1504e84aef314d1933f5efc2c817d':
Remove 32-bit assumptions from the ELF code.
2013-10-01 10:02:16 -07:00
Elliott Hughes
f281fd02e9
Merge "Better statfs/fstatfs glibc compatibility."
2013-10-01 15:30:40 +00:00
Elliott Hughes
693bd73fcd
Merge "Remove 32-bit assumptions from the ELF code."
2013-10-01 15:23:44 +00:00
Elliott Hughes
01a700e5d2
Better statfs/fstatfs glibc compatibility.
...
Change-Id: I069d169c96cd71b75a045ec911fb4bd484c6b2c9
2013-09-30 21:57:07 -07:00
Elliott Hughes
6c8dc46406
am 28317d3a
: am f5ea738b
: Merge "Fix x86 build."
...
* commit '28317d3a161c88f88e85d97d584d656ffbe63a19':
Fix x86 build.
2013-09-30 20:53:55 -07:00
Elliott Hughes
28317d3a16
am f5ea738b
: Merge "Fix x86 build."
...
* commit 'f5ea738baa0ad5b32348f2ac42450d33d452ef31':
Fix x86 build.
2013-09-30 20:51:53 -07:00
Elliott Hughes
f5ea738baa
Merge "Fix x86 build."
2013-10-01 02:23:02 +00:00
Elliott Hughes
3456a1f5f4
Fix x86 build.
...
Change-Id: I1f2d8189bec3d0e25d21ca7d7bd73fd02f8678e2
2013-09-30 19:20:02 -07:00
Elliott Hughes
5d641bcf70
am f5dcdfc4
: am 6dee3b9a
: Merge "Add x86_64 to the bionic headers."
...
* commit 'f5dcdfc438684bbe93e398b6551f915fe3fe10bf':
Add x86_64 to the bionic headers.
2013-09-30 18:45:57 -07:00
Elliott Hughes
f5dcdfc438
am 6dee3b9a
: Merge "Add x86_64 to the bionic headers."
...
* commit '6dee3b9aeec40bb518c1a29b4462300869a03d8e':
Add x86_64 to the bionic headers.
2013-09-30 18:44:28 -07:00
Elliott Hughes
c620059479
Remove 32-bit assumptions from the ELF code.
...
Change-Id: I2c1f3d34c33685799aade8866eec44479ff9f963
2013-09-30 18:43:46 -07:00
Elliott Hughes
6dee3b9aee
Merge "Add x86_64 to the bionic headers."
2013-10-01 01:42:43 +00:00
Elliott Hughes
d3e64a3f40
Add x86_64 to the bionic headers.
...
Manual changes:
cpp.py: cope with macros that refer to other macros.
defaults.py: x86 no longer always implies __i386__; use __i386__ to replace
the kernel CONFIG_X86_32 flag.
asm/page.h: the upstream page.h isn't a uapi header and no longer includes
the stuff we were using it for. Let's just have our own static file, since
it's the same for all our architectures (both 32- and 64-bit).
sys/select.h: we used to use the various FD_SET-related macros from the
kernel header files, but they've gone. Adjust by adding trivial equivalent
definitions.
Automated changes:
libc/kernel/arch-x86, libc/kernel/common: regenerated from
external/kernel-headers.
Change-Id: I84fc0ed52dc742e043b4ae300fd3b58ee99b7fcd
2013-09-30 18:42:13 -07:00
Elliott Hughes
b277509095
am 34284954
: am 76218efb
: Merge "Fix inttypes.h and stdint.h for 64-bit (and C++11)."
...
* commit '34284954b3b43010d87c6f99a50dc673a55fbb04':
Fix inttypes.h and stdint.h for 64-bit (and C++11).
2013-09-30 16:23:03 -07:00
Elliott Hughes
34284954b3
am 76218efb
: Merge "Fix inttypes.h and stdint.h for 64-bit (and C++11)."
...
* commit '76218efbeb2e124656ce15d4eb5a7039da065123':
Fix inttypes.h and stdint.h for 64-bit (and C++11).
2013-09-30 16:19:18 -07:00
Elliott Hughes
76218efbeb
Merge "Fix inttypes.h and stdint.h for 64-bit (and C++11)."
2013-09-30 21:53:06 +00:00
Elliott Hughes
a9a02acc9f
Fix inttypes.h and stdint.h for 64-bit (and C++11).
...
Change-Id: I394630348413c9aafcac137ce1ca5f0a93d9ab6f
2013-09-30 14:46:47 -07:00
Christopher Ferris
a59e16bac9
am 34c2a9fc
: Move stack unwinding test into library.
...
* commit '34c2a9fc37848d446bf91ce61783884232fffeb1':
Move stack unwinding test into library.
2013-09-30 14:46:05 -07:00
Christopher Ferris
704ec47d42
am 34c2a9fc
: Move stack unwinding test into library.
...
* commit '34c2a9fc37848d446bf91ce61783884232fffeb1':
Move stack unwinding test into library.
2013-09-30 14:01:03 -07:00
Christopher Ferris
b915074f27
am 427e8cf9
: Fix line that got removed by merge.
...
* commit '427e8cf90248f7da0a789fb3b4fb9a859c19aacd':
Fix line that got removed by merge.
2013-09-29 22:40:36 -07:00
Christopher Ferris
427e8cf902
Fix line that got removed by merge.
...
(cherry picked from commit f14d71fcf7
)
Change-Id: Id3dd54d9efd87ef2bbb2c90adae2ce3911695027
2013-09-29 22:14:56 -07:00
Elliott Hughes
0fbac2729b
am 967a6d37
: am ef8eb557
: am 4d016c6a
: Merge "Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications)."
...
* commit '967a6d37681a006a0be588f83a81b12e79d85f8f':
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
2013-09-27 15:47:41 -07:00
Elliott Hughes
967a6d3768
am ef8eb557
: am 4d016c6a
: Merge "Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications)."
...
* commit 'ef8eb55708f67fc2977a155dddb1b3f1f732b3fe':
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
2013-09-27 15:44:53 -07:00
Elliott Hughes
ef8eb55708
am 4d016c6a
: Merge "Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications)."
...
* commit '4d016c6a83bb8c8b8ec88400031b42c41f18edbb':
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
2013-09-27 15:41:25 -07:00
Elliott Hughes
4d016c6a83
Merge "Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications)."
2013-09-27 22:38:45 +00:00
Nick Kralevich
3f836f85af
am cadc6aaf
: am f56e0e4b
: am 6aed6077
: Merge "Fix unnecessary call to __strncpy_chk2"
...
* commit 'cadc6aaf41e29ffcca0e4b801ffa294e6cea968e':
Fix unnecessary call to __strncpy_chk2
2013-09-27 15:20:56 -07:00
Nick Kralevich
cadc6aaf41
am f56e0e4b
: am 6aed6077
: Merge "Fix unnecessary call to __strncpy_chk2"
...
* commit 'f56e0e4b5e97f4e7fed6e06dde30053ea687716e':
Fix unnecessary call to __strncpy_chk2
2013-09-27 15:18:21 -07:00
Nick Kralevich
f56e0e4b5e
am 6aed6077
: Merge "Fix unnecessary call to __strncpy_chk2"
...
* commit '6aed6077fbe2b2039ab9160fb1e33ffe07907f32':
Fix unnecessary call to __strncpy_chk2
2013-09-27 15:15:31 -07:00
Nick Kralevich
6aed6077fb
Merge "Fix unnecessary call to __strncpy_chk2"
2013-09-27 22:13:19 +00:00
Christopher Ferris
f14d71fcf7
Fix line that got removed by merge.
...
Change-Id: I8c1f3624b52161893d1e04f0a156df613f90e39d
2013-09-27 14:18:36 -07:00
Conley Owens
8612b4e453
am e83a7806
: resolved conflicts for merge of f4af9110
to klp-dev-plus-aosp
...
* commit 'e83a780600eda88d351fda590079265bcc0d1f56':
Create bionic unit test library for use with CTS.
2013-09-27 13:27:49 -07:00
Nick Kralevich
d13c2b1ba6
Fix unnecessary call to __strncpy_chk2
...
If "n" is smaller than the size of "src", then we'll
never read off the end of src. It makes no sense to call
__strncpy_chk2 in those circumstances.
For example, consider the following code:
int main() {
char src[10];
char dst[5];
memcpy(src, "0123456789", sizeof(src));
strncpy(dst, src, sizeof(dst));
dst[4] = '\0';
printf("%s\n", dst);
return 0;
}
In this code, it's clear that the strncpy will never read off
the end of src.
Change-Id: I9cf58857a0c5216b4576d21d3c1625e2913ccc03
2013-09-27 13:21:24 -07:00
Conley Owens
e83a780600
resolved conflicts for merge of f4af9110
to klp-dev-plus-aosp
...
Change-Id: I9e499e552b758392dd0c7b8d888944c0150dd22a
2013-09-27 13:13:30 -07:00
Nick Kralevich
127ac6f86a
am 9a622f87
: am cc362291
: am 8427b745
: Merge "libc: fortify recvfrom()"
...
* commit '9a622f874ceb90431623af140ca9a78eadc96dcb':
libc: fortify recvfrom()
2013-09-27 09:12:53 -07:00
Nick Kralevich
9a622f874c
am cc362291
: am 8427b745
: Merge "libc: fortify recvfrom()"
...
* commit 'cc362291362f8183431eccb19267c8a625f36006':
libc: fortify recvfrom()
2013-09-27 09:11:00 -07:00
Nick Kralevich
cc36229136
am 8427b745
: Merge "libc: fortify recvfrom()"
...
* commit '8427b7450fe068db6484d161f7004661c4698858':
libc: fortify recvfrom()
2013-09-27 09:08:25 -07:00