Elliott Hughes
44fd0d92d6
am 94c325fb
: am 269851bf
: Merge "Declare __page_shift and __page_size with C linkage."
...
* commit '94c325fb3bd8844dcc58640afb8f33668b684bc1':
Declare __page_shift and __page_size with C linkage.
2013-09-19 12:06:43 -07:00
Bernhard Rosenkraenzer
9ae59c02ca
Declare __page_shift and __page_size with C linkage.
...
__page_shift and __page_size were accidentally declared in unistd.h with
C linkage - their implementation needs to use the same linkage.
Going forward, though, let's stop the inlining madness and let's kill
the non-standard __getpageshift(). This patch takes getpagesize(3) out
of line and removes __getpageshift but fixes __page_shift and __page_size
for backwards binary compatibility.
Change-Id: I35ed66a08989ced1db422eb03e4d154a5d6b5bda
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2013-09-19 11:55:36 -07:00
Christopher Ferris
5cb0436930
am 1a88ca08
: am 98c726ec
: Merge "Add the dl_iterate_phdr function to libdl for arm."
...
* commit '1a88ca08046ea510bfc8d3de6875537f124b3ce3':
Add the dl_iterate_phdr function to libdl for arm.
2013-09-06 10:57:40 -07:00
Christopher Ferris
24053a461e
Add the dl_iterate_phdr function to libdl for arm.
...
Bug: 8410085
Merge from internal master.
(cherry-picked from cb491bc66d
)
Change-Id: I94ed51bc5d4c626df7552c0e85c31ccee2d6568f
2013-09-06 09:53:54 -07:00
Elliott Hughes
eb31e1c558
am 1e96d49a
: am afa31042
: Merge "Fix strchr for basic non-sse case on x86"
...
* commit '1e96d49a7d4d1af8f3bd6630e4ec9369813f18e7':
Fix strchr for basic non-sse case on x86
2013-09-03 14:07:11 -07:00
Pavel Chupin
3c4b50fd8c
Fix strchr for basic non-sse case on x86
...
Fix source location. Move declaration of __strchr_chk out of
ifdef __BIONIC_FORTIFY which should be available for strchr.cpp
compilation when __BIONIC_FORTIFY is not defined.
Change-Id: I552a6e16656e59b276b322886cfbf57bbfb2e6a7
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-09-03 16:20:52 +04:00
Nick Kralevich
4d0fbf9b07
am 89dcc10c
: am 4e3ed44d
: Merge "cdefs.h: introduce __bos0"
...
* commit '89dcc10c320c032faef83c4940a57949ade01dba':
cdefs.h: introduce __bos0
2013-08-28 14:36:50 -07:00
Nick Kralevich
bd8e6749b7
cdefs.h: introduce __bos0
...
Introduce __bos0 as a #define for __builtin_object_size((s), 0).
This macro is intended to be used for places where the standard
__bos macro isn't appropriate.
memcpy, memmove, and memset deliberately use __bos0. This is done
for two reasons:
1) I haven't yet tested to see if __bos is safe to use.
2) glibc uses __bos0 for these methods.
Change-Id: Ifbe02efdb10a72fe3529dbcc47ff647bde6feeca
2013-08-28 14:27:14 -07:00
Nick Kralevich
2c87c3ff02
am cfd0d72d
: am eb8f3622
: Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
...
* commit 'cfd0d72da8641087f9c4015ee586614da9f7320a':
FORTIFY_SOURCE: introduce __strncpy_chk2
2013-08-28 13:07:57 -07:00
Nick Kralevich
93501d3ab8
FORTIFY_SOURCE: introduce __strncpy_chk2
...
This change detects programs reading beyond the end of "src" when
calling strncpy.
Change-Id: Ie1b42de923385d62552b22c27b2d4713ab77ee03
2013-08-28 12:39:06 -07:00
Elliott Hughes
34cd499875
am fd61eccf
: am ff9b7aa6
: Merge "Make ctype.h a little less unhygienic."
...
* commit 'fd61eccf6b909ee6374ad43164f0e9bcd4b3547c':
Make ctype.h a little less unhygienic.
2013-08-13 14:45:44 -07:00
Elliott Hughes
5e9b20f721
Make ctype.h a little less unhygienic.
...
This caused trouble for stlport.
Change-Id: Id40787c5a2b7a3a4e12fb557efe549778a01cbbd
2013-08-13 14:30:59 -07:00
Elliott Hughes
c1772397f9
am ff8dcd4a
: am c933493a
: Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."
...
* commit 'ff8dcd4a1056257b454da71e1ea1371bb73d3a79':
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
2013-08-12 14:28:52 -07:00
Elliott Hughes
aec2ffbc5a
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
...
Change-Id: I94c411c22634e43184445c82e7388e51fc46a8cc
2013-08-12 12:07:05 -07:00
Elliott Hughes
840a114eb1
Add futimens.
...
(cherry picked from commit d0be7c8f9a
)
Bug: 10239370
Change-Id: I0087e85a94d83b6ce68ec6a0768c44cbe4bd0132
2013-08-08 17:52:06 -07:00
Elliott Hughes
d0be7c8f9a
Add futimens.
...
Bug: 10239370
Change-Id: I518340084103dc339ef8a065d4837d6258a1381d
2013-08-08 17:13:33 -07:00
Elliott Hughes
e66ffef900
am cd927519
: Merge "Fix stdint.h intptr_t/uintptr_t for x86_64/x32"
...
* commit 'cd927519a94939f2ebc307544f827baade529bc9':
Fix stdint.h intptr_t/uintptr_t for x86_64/x32
2013-08-05 15:51:54 -07:00
Elliott Hughes
28e0ec8d61
am a0473d77
: Merge "syslog needs a valid socket path for _PATH_LOG"
...
* commit 'a0473d77b2d3a6f26e29cc8c2fdaeb2a4b3ab8f8':
syslog needs a valid socket path for _PATH_LOG
2013-08-05 15:51:53 -07:00
Elliott Hughes
cd927519a9
Merge "Fix stdint.h intptr_t/uintptr_t for x86_64/x32"
2013-08-05 20:55:24 +00:00
Elliott Hughes
a0473d77b2
Merge "syslog needs a valid socket path for _PATH_LOG"
2013-08-05 20:41:50 +00:00
Pavel Chupin
0a9c615a89
Fix stdint.h intptr_t/uintptr_t for x86_64/x32
...
Patch is required in NDK headers as well to be able to build multilib
GCC with libgomp support.
It's here: https://android-review.googlesource.com/#/c/62982
Change-Id: I2bec25d8cbca0e5ef1a0857008ececd92f4911be
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-08-02 19:23:37 +04:00
Elliott Hughes
abf3638317
am 101b5e1f
: Merge "Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way."
...
* commit '101b5e1f6cc4e24635760928b3d2c1e51c1e5774':
Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way.
2013-07-29 17:35:49 -07:00
Elliott Hughes
c03e1e7439
Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way.
...
Also make sysconf use PTHREAD_STACK_MIN rather than redefining its
own, different, constant.
Bug: 9997352
Change-Id: I9a8e7d2b18e691439abfb45533e82c36eee9e81d
2013-07-29 17:09:36 -07:00
Elliott Hughes
47c7e33ccb
am ff20b911
: am 8a363692
: Merge "Add TCP_INFO state enum values."
...
* commit 'ff20b9110659e67433ce641a6224cdc9ccc01301':
Add TCP_INFO state enum values.
2013-07-11 18:57:42 -07:00
Nick Kralevich
4fa5d6a5db
am ef49e99d
: am d30877ae
: Merge "syslog.h: add __printflike to syslog functions"
...
* commit 'ef49e99d92597a4e9fddbba0e1e3feddc06fee53':
syslog.h: add __printflike to syslog functions
2013-07-11 18:57:41 -07:00
Elliott Hughes
ff20b91106
am 8a363692
: Merge "Add TCP_INFO state enum values."
...
* commit '8a363692be45ed1b36e1f1f21707b6f35f5519c8':
Add TCP_INFO state enum values.
2013-07-11 18:52:22 -07:00
Nick Kralevich
ef49e99d92
am d30877ae
: Merge "syslog.h: add __printflike to syslog functions"
...
* commit 'd30877ae28f3c308edf142c091b3a8acc4467c6d':
syslog.h: add __printflike to syslog functions
2013-07-11 18:52:01 -07:00
Elliott Hughes
0dff43cab4
Add TCP_INFO state enum values.
...
Bug: https://code.google.com/p/android/issues/detail?id=38881
Change-Id: Ie22816c666474e6441e0ec3afd2a6eb04d64a673
2013-07-11 16:21:32 -07:00
Geremy Condra
bb17967761
Merge "Add marking of DNS sockets for mark based routing"
2013-07-11 22:10:31 +00:00
Nick Kralevich
6b1dd1797e
syslog.h: add __printflike to syslog functions
...
Allow the compiler to detect formating bugs.
Change-Id: I6a4af6cae59dc3adf14b075431a41885213a649a
2013-07-10 07:37:11 -07:00
Elliott Hughes
731f7c2d0e
am 9d476716
: Merge "Add <sys/statvfs.h>."
...
* commit '9d476716c2bd7bc5a018a71e121257c35e965058':
Add <sys/statvfs.h>.
2013-07-09 13:44:57 -07:00
Elliott Hughes
06040fd75c
Add <sys/statvfs.h>.
...
Bug: 2512019
Change-Id: I6e7fd3fa281977cc4bc270481a95416b5b2dc351
2013-07-09 13:25:03 -07:00
Chad Brubaker
c39214e0ac
Add marking of DNS sockets for mark based routing
...
Adds an extra mark parameter to android_getaddrinfoforiface,
android_gethostbyaddrforiface and android_gethostbynameforiface that if set
will cause all packets sent by DNS requests to have that mark
Change-Id: I6f72390e4ce5bfc3cc73183f9b2fb3705a11685f
2013-07-09 13:16:22 -07:00
Elliott Hughes
f3f72e7f27
am 4fc8a0c1
: Merge "Remove <netinet/icmp6.h> ni_* macros."
...
* commit '4fc8a0c1165537b693c900ac3e2c61470bd7e484':
Remove <netinet/icmp6.h> ni_* macros.
2013-07-08 15:09:07 -07:00
Elliott Hughes
c2cd33efc4
Remove <netinet/icmp6.h> ni_* macros.
...
glibc doesn't have these, and they prevent ping from building out of
the box because it assumes it can define them.
Bug: 9671560
Change-Id: I815f2a9c4fd96a0ea2952eb5a71ddf51e0763660
2013-07-08 15:07:41 -07:00
Elliott Hughes
233050b15e
am e31c45c9
: Merge "Make bionic\'s <netinet/icmp6.h> standalone, like glibc\'s."
...
* commit 'e31c45c9fa5e0d2853941282e619b753550b82ae':
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
2013-07-08 11:21:53 -07:00
Elliott Hughes
3a040d8379
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
...
This removes the need for a bionic-specific hack in external/iproute2.
Bug: 9671560
Change-Id: I9f15be0711d26bca863bd66be9a39606500fb948
2013-07-08 11:16:24 -07:00
Elliott Hughes
62bdd03120
am 6b33f31b
: Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
...
* commit '6b33f31b0994b8132bed8936685522e2e01754d8':
Fix IPv6 filtering definitions in netinet/icmp6.h.
2013-07-08 10:34:41 -07:00
Lorenzo Colitti
bfc6a59556
Fix IPv6 filtering definitions in netinet/icmp6.h.
...
Linux and *BSD kernels use opposite values to indicate pass/block
in ICMPv6 filters, and assign a different value to the
ICMP6_FILTER sockopt.
Bug: 9671560
Bug: 9469682
Change-Id: Ic0f1fcd48891add992acf97632f60aebd172c1d7
2013-07-08 10:31:29 -07:00
Elliott Hughes
24400ac1e3
am e63ea6ac
: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
...
* commit 'e63ea6aca7d01ba9219b877ed5fab6de5c6037fb':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
2013-07-08 10:12:32 -07:00
Elliott Hughes
e42e51d563
Clean up <sys/mount.h>/<linux/fs.h> duplication.
...
Roll on uapi...
Bug: 6340120
Change-Id: Ic9521905683946e836574e4d768e34853ea777fa
2013-07-03 14:58:04 -07:00
Elliott Hughes
a8b954c51e
am de2781d9
: Merge changes I01345c23,I3b57517c
...
* commit 'de2781d906f27be4df3e03a8e5041dcc1aeb281d':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
2013-07-03 13:39:16 -07:00
Lorenzo Colitti
f936ef1a9f
Include linux/termios.h from sys/ioctl.h.
...
On NetBSD and glibc, including sys/ioctl.h provides some
terminal ioctl data structures such as struct winsize. For
compatibility, provide these via sys/ioctl.h in bionic as well.
bionic does not have its own definitions for these structures, so
get them from the Linux kernel definitions.
Change-Id: I01345c23c0bebd60b0a80fc33668e7c0ad7356c3
2013-07-03 13:35:18 -07:00
Elliott Hughes
833dc584d4
am 87b4286f
: Merge "Expose dn_comp and dn_expand to system C code."
...
* commit '87b4286f092094a2e8069a06e20ef5036a258172':
Expose dn_comp and dn_expand to system C code.
2013-07-02 16:02:30 -07:00
Lorenzo Colitti
b8e435c1d5
Expose dn_comp and dn_expand to system C code.
...
This is needed to compile open-source code that wants to
expand/compress domain names itself, such as ping6.
Bug: 9469682
Change-Id: I339c6538936d05c031bc6fb0a8793aaf1429dea4
2013-07-02 15:57:57 -07:00
Elliott Hughes
7c808b29d5
am feec97a7
: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
...
* commit 'feec97a7c7fbd032174fb4870a02422c2acd891a':
Fix inttypes.h PRI?PTR and SCN?PTR macros.
2013-07-02 15:44:48 -07:00
Elliott Hughes
74f0833df6
Fix inttypes.h PRI?PTR and SCN?PTR macros.
...
Our intptr_t and uintptr_t aren't "long". Add a compilation test so we remember
to fix this to cope with 32- and 64-bit later.
Bug: http://code.google.com/p/android/issues/detail?id=57218
Change-Id: I2f816d339edb4f7d57e4418b818fb4c602093f38
2013-07-02 15:35:27 -07:00
Elliott Hughes
dcd237a897
am 1ba3a2c2
: Merge "Update icmp6.h to current NetBSD."
...
* commit '1ba3a2c26937c68a4a0bd4fdffe95f5162077997':
Update icmp6.h to current NetBSD.
2013-07-02 12:34:36 -07:00
Lorenzo Colitti
ce7c404dc7
Update icmp6.h to current NetBSD.
...
This adds a few bits we need such as RFC 6106 support and the
definition of MLD_LISTENER_REDUCTION.
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/icmp6.h?rev=1.47
Bug: 9469682
Change-Id: I97a4c2f0893012ce315334367c055097d0f8bb10
2013-07-02 09:38:59 -07:00
Nick Kralevich
28d298a673
am 413eef71
: Merge "More FORTIFY_SOURCE functions under clang"
...
* commit '413eef716f822d5eb4f57618f6780c6af5036460':
More FORTIFY_SOURCE functions under clang
2013-07-01 10:00:09 -07:00