Calin Juravle
55b6ec3f93
Merge "Update the NOTICE files"
2014-03-10 11:25:50 +00:00
Calin Juravle
c4fbf92ce1
Update the NOTICE files
...
Change-Id: I751c4eeda813b811faa4ee26c64445896db3d5bd
2014-03-10 11:23:52 +00:00
Calin Juravle
0bca08d69f
Merge "Update res_debug.c to take into account changes to the nameser.h"
2014-03-10 11:20:12 +00:00
The Android Automerger
56ce3ebc3b
merge in master-release history after reset to master
2014-03-09 05:49:10 -07:00
Brian Carlstrom
c13a1b2bad
am e9dbdc8c: am cd50898a: Merge "Add includes for waitpid"
...
* commit 'e9dbdc8cf429ff045861a1128ccd8be2c3d2324a':
Add includes for waitpid
2014-03-08 23:53:49 +00:00
Brian Carlstrom
e9dbdc8cf4
am cd50898a: Merge "Add includes for waitpid"
...
* commit 'cd50898ad11ad3157f22fac15802757a9b559822':
Add includes for waitpid
2014-03-08 23:48:00 +00:00
Brian Carlstrom
cd50898ad1
Merge "Add includes for waitpid"
2014-03-08 23:41:46 +00:00
Brian Carlstrom
be1d91dedc
Add includes for waitpid
...
(cherry picked from commit f07c5dd9ab63f2e8ba736107bd4b69bbd8829c9f)
Change-Id: I7a765fd7a3a5f8f29a703f6a591c4fd8df4ebf1c
2014-03-08 15:09:43 -08:00
The Android Automerger
495aac1fbb
merge in master-release history after reset to master
2014-03-08 05:49:28 -08:00
Elliott Hughes
69ee396704
am 00b522ad: am fd9e20d1: Merge "Fix pthread_detach for already-exited threads."
...
* commit '00b522ad9e87cb9ae5ad776ded92ac01e79ef31b':
Fix pthread_detach for already-exited threads.
2014-03-08 11:02:22 +00:00
Elliott Hughes
fb2fbbc269
am 206e2c05: am 333e2ae8: Merge "Add si_timerid to <signal.h>."
...
* commit '206e2c05f1b08a60b5706c93fbb6e53f456ae67d':
Add si_timerid to <signal.h>.
2014-03-08 07:28:14 +00:00
Elliott Hughes
d1256ccbb3
am 68126def: am 4d46c940: Merge "Rewrite the POSIX timer functions."
...
* commit '68126def6e37eae1ddc0b372fcecc3ac8287b97e':
Rewrite the POSIX timer functions.
2014-03-08 07:28:11 +00:00
Elliott Hughes
00b522ad9e
am fd9e20d1: Merge "Fix pthread_detach for already-exited threads."
...
* commit 'fd9e20d10f946334955ca199b0178580d284e89f':
Fix pthread_detach for already-exited threads.
2014-03-08 03:13:34 +00:00
Elliott Hughes
fd9e20d10f
Merge "Fix pthread_detach for already-exited threads."
2014-03-08 03:07:46 +00:00
Elliott Hughes
04620a3cd7
Fix pthread_detach for already-exited threads.
...
Change-Id: I2bf7f41234d93b226132a4c51705f4186f4961c3
Reported-by: Paresh Nakhe <pnakhe@codeaurora.org>
2014-03-07 17:59:05 -08:00
Elliott Hughes
206e2c05f1
am 333e2ae8: Merge "Add si_timerid to <signal.h>."
...
* commit '333e2ae87dac85d6420786e9e12ffd7ea84dae38':
Add si_timerid to <signal.h>.
2014-03-08 01:56:39 +00:00
Elliott Hughes
68126def6e
am 4d46c940: Merge "Rewrite the POSIX timer functions."
...
* commit '4d46c940315af2d93efb44e751b69ea6880a5d65':
Rewrite the POSIX timer functions.
2014-03-08 01:56:38 +00:00
Calin Juravle
c25a920e95
am 90b01576: Merge "Fixed int fast types for LP64"
...
* commit '90b0157679a984f1829a72f8c642d17030aa7644':
Fixed int fast types for LP64
2014-03-08 01:51:50 +00:00
Elliott Hughes
333e2ae87d
Merge "Add si_timerid to <signal.h>."
2014-03-08 00:52:02 +00:00
Elliott Hughes
4d46c94031
Merge "Rewrite the POSIX timer functions."
2014-03-08 00:50:56 +00:00
Elliott Hughes
4b558f50a4
Rewrite the POSIX timer functions.
...
This is a much simpler implementation that lets the kernel
do as much as possible.
Co-authored-by: Jörgen Strand <jorgen.strand@sonymobile.com>
Co-authored-by: Snild Dolkow <snild.dolkow@sonymobile.com>
Change-Id: Iad19f155de977667aea09410266d54e63e8a26bf
2014-03-07 16:49:46 -08:00
Elliott Hughes
a0cd9bc339
Add si_timerid to <signal.h>.
...
The kernel uses the very misleading name "si_tid", but glibc uses the more
intention-revealing "si_timerid". We should let people use that.
(Added because I wanted to improve SI_TIMER siginfo_t dumping in strace.)
Change-Id: Ib626cdd3b57a6afb276a15753a237b4e81ec45e3
2014-03-07 15:41:25 -08:00
Elliott Hughes
42afda7227
am e65055af: Merge "Stop asking GCC to cause trouble."
...
* commit 'e65055af112780623f372aca6a1f78d2b2acb34f':
Stop asking GCC to cause trouble.
2014-03-07 23:19:18 +00:00
Elliott Hughes
74c946d42e
am 26172fa4: Merge "Move the upstream-netbsd libc files into the correct directory."
...
* commit '26172fa401a4323c8c9b4063a59ab6d08ca617bf':
Move the upstream-netbsd libc files into the correct directory.
2014-03-07 23:00:04 +00:00
Elliott Hughes
e600c51c0c
am 8d0fe1c4: Merge "Remove two DNS files that weren\'t being built."
...
* commit '8d0fe1c49e83592372becc996accfe9d5948aa9b':
Remove two DNS files that weren't being built.
2014-03-07 23:00:02 +00:00
Elliott Hughes
1fa1416bb8
am cb43f847: Merge "Unify our assembler macros."
...
* commit 'cb43f8474dafd7a4d3eb605d4a7c7f69ad7cef2e':
Unify our assembler macros.
2014-03-07 23:00:02 +00:00
Elliott Hughes
60aa4222c4
am 22c6b7ff: Merge "Fix mips64 crt build."
...
* commit '22c6b7ffd36fe8b34b677eea94d00aef2624e4e8':
Fix mips64 crt build.
2014-03-07 22:59:46 +00:00
Elliott Hughes
918b2aa34c
am 6a686556: Merge "Remove useless _C_LABEL from our assembler source."
...
* commit '6a686556b9f112fdf02ce404d680306ab1d901be':
Remove useless _C_LABEL from our assembler source.
2014-03-07 22:59:46 +00:00
Elliott Hughes
db6236ba23
am bfa2b6fc: Merge "Stop advertising an arm32-specific hack like it\'s a build system feature."
...
* commit 'bfa2b6fc6a09df9815773890db94d6a126565289':
Stop advertising an arm32-specific hack like it's a build system feature.
2014-03-07 22:59:45 +00:00
Dmitriy Ivanov
b450e464d3
am 54d49ac7: Merge "Added script generating additions to libgcc_compat.c from linker errors"
...
* commit '54d49ac75b4b71f38eb154ab8e05f60b7c347a2b':
Added script generating additions to libgcc_compat.c from linker errors
2014-03-07 22:59:45 +00:00
Elliott Hughes
6d04702970
am ca566b31: Merge "Don\'t explicitly list the tzcode files."
...
* commit 'ca566b31036704eb6cdde05a0bd9ee972d7a995d':
Don't explicitly list the tzcode files.
2014-03-07 22:59:42 +00:00
Calin Juravle
0ad555a908
Update res_debug.c to take into account changes
...
to the nameser.h
Bug: 13219633
Change-Id: Id75de2e8933f716ad86ca296a97f5c619fb946a7
2014-03-07 20:03:57 +00:00
Narayan Kamath
530e4359e2
am d9459525: Merge "Fix signbit / infinite / isinf / isnan unit tests."
...
* commit 'd9459525b4133e825bf95d03b06e695433c124bd':
Fix signbit / infinite / isinf / isnan unit tests.
2014-03-07 19:41:17 +00:00
Elliott Hughes
42804637a0
am 75f04d10: Merge "Remove the useless _C_LABEL from generated system calls."
...
* commit '75f04d107695f17bc800024d03e03b602dc02ee1':
Remove the useless _C_LABEL from generated system calls.
2014-03-07 19:41:10 +00:00
Elliott Hughes
3198715eb5
am fbaddda9: Merge "Linker writes to wrong memory location when processing DT_MIPS_RLD_MAP"
...
* commit 'fbaddda9f04fa504deb752bba819eb1fa5439baa':
Linker writes to wrong memory location when processing DT_MIPS_RLD_MAP
2014-03-07 19:41:03 +00:00
Elliott Hughes
26e961eb0a
am b69c0b53: Merge "Make mips/mips64 syscall stubs more like the other architectures."
...
* commit 'b69c0b532e4f6d32e7c43a7be02a27e0b02e75c3':
Make mips/mips64 syscall stubs more like the other architectures.
2014-03-07 19:41:02 +00:00
Elliott Hughes
830b23a9f3
am 6db95a86: Merge "Top-level documentation about working on bionic."
...
* commit '6db95a869e5c57713632106878d854c7c0aff7a1':
Top-level documentation about working on bionic.
2014-03-07 19:40:59 +00:00
Elliott Hughes
bc73c85f7a
am e6c451f5: Merge "Make mips generated assembler more like the mips64 stuff."
...
* commit 'e6c451f5f2e17fccccedaa1c2a90d8d9ba0c1917':
Make mips generated assembler more like the mips64 stuff.
2014-03-07 19:40:51 +00:00
Elliott Hughes
679b356d4d
am 44ef37c1: Merge "Use uid_t and gid_t for st_uid and st_gid in struct stat."
...
* commit '44ef37c1b445e864068cdcd885ab3d7b17079ad3':
Use uid_t and gid_t for st_uid and st_gid in struct stat.
2014-03-07 19:40:11 +00:00
Elliott Hughes
2bb7f7c9a2
am 24ef4779: Merge "Fix build by avoiding the _C_LABEL macro."
...
* commit '24ef4779eb47f23b8d4f4e678d677bd45a91373f':
Fix build by avoiding the _C_LABEL macro.
2014-03-07 19:40:10 +00:00
Elliott Hughes
3d7a897b68
am 787c1f93: Merge "Add missing file from previous change."
...
* commit '787c1f937a915feefb767d0c6a15ddb70e6de933':
Add missing file from previous change.
2014-03-07 19:40:08 +00:00
Elliott Hughes
73ddb94692
am b3602078: Merge "Implement some of the missing LFS64 support."
...
* commit 'b36020789ac860fcfbbeaf56d560926d8ee228f6':
Implement some of the missing LFS64 support.
2014-03-07 19:40:05 +00:00
Elliott Hughes
1e56f06585
am 3623d806: Merge "Fix x86 build."
...
* commit '3623d80675e5321b92c2d88a7b7ec6bd998d81d5':
Fix x86 build.
2014-03-07 19:39:57 +00:00
Elliott Hughes
9df798dcfc
am ffe02668: Merge "bionic: fix __set_errno for arm64 syscalls that return a 64-bit value"
...
* commit 'ffe026680edaba268330bc67dd986d2c900ecfc7':
bionic: fix __set_errno for arm64 syscalls that return a 64-bit value
2014-03-07 19:39:55 +00:00
Elliott Hughes
dd0222a1fe
am 7f15e28d: Merge "Clean up warnings in libstdc++."
...
* commit '7f15e28dd4184015a2c990b6e45c33c35b251935':
Clean up warnings in libstdc++.
2014-03-07 19:39:54 +00:00
Elliott Hughes
2f5ffde865
am cd6748cd: Merge "Clean up various warnings in bionic."
...
* commit 'cd6748cdd7bcab702fe0bf6de943eb832f4fb762':
Clean up various warnings in bionic.
2014-03-07 19:39:53 +00:00
Elliott Hughes
0cc47451b8
am d4bc9ef8: Merge "Remove duplicate definitions of MIN and MAX."
...
* commit 'd4bc9ef83b36916d5e63c4c3e4a092381473ea52':
Remove duplicate definitions of MIN and MAX.
2014-03-07 19:39:37 +00:00
Colin Cross
ec1152dded
am 95b808c4: Merge "build linker and linker64 on 64-bit architectures"
...
* commit '95b808c4ae11ea5737fee63f7b61673483ea5e2d':
build linker and linker64 on 64-bit architectures
2014-03-07 19:33:36 +00:00
Calin Juravle
c3957eea26
am d57eb903: am b145b5ef: Merge "Fix broken pointer overflow check ns_name_unpack()"
...
* commit 'd57eb903c1ca2f798ab6a9ab0f9c84678b0f3025':
Fix broken pointer overflow check ns_name_unpack()
2014-03-07 19:29:51 +00:00
Calin Juravle
a7c42b1268
am 542e6c87: am d9ba757e: Merge "Sync up nameser with upstream(2014.03.05)"
...
* commit '542e6c87e52f7886e5ede72e3222c2d6ed83aefb':
Sync up nameser with upstream(2014.03.05)
2014-03-07 19:29:50 +00:00