generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 205cc415: Merge "Improve <sys/cdefs.h>."

Browse Source 
* commit '205cc41556d44b104a21bc6839b7ea44f72df9ba':
  Improve <sys/cdefs.h>.
This commit is contained in:
Elliott Hughes
2014-08-18 22:28:12 +00:00
committed by Android Git Automerger
parent 247e441b0c 205cc41556
commit c228979648
11 changed files with 39 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libc/dns/resolv/__dn_comp.c
View File

@@ -1,38 +0,0 @@
/* $NetBSD: __dn_comp.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */
/*
* written by matthew green, 22/04/97.
* public domain.
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: __dn_comp.c,v 1.4 2005/09/13 01:44:10 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#if defined(__indr_reference)
__indr_reference(__dn_comp,dn_comp)
#else
#include <sys/types.h>
#include <netinet/in.h>
#ifdef ANDROID_CHANGES
#include "resolv_private.h"
#else
#include <resolv.h>
#endif
/* XXX THIS IS A MESS! SEE <resolv.h> XXX */
#undef dn_comp
int dn_comp(const char *, u_char *, int, u_char **, u_char **);
int
dn_comp(const char *exp_dn, u_char *comp_dn, u_char **dnptrs,
u_char **lastdnptr, int length)
{
return __dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr);
}
#endif

33
libc/dns/resolv/__res_close.c
View File

@@ -1,33 +0,0 @@
/* $NetBSD: __res_close.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */
/*
* written by matthew green, 22/04/97.
* public domain.
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: __res_close.c,v 1.4 2005/09/13 01:44:10 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#if defined(__indr_reference)
__indr_reference(__res_close, res_close)
#else
#include <sys/types.h>
#include <netinet/in.h>
#include "resolv_private.h"
/* XXX THIS IS A MESS! SEE <resolv.h> XXX */
#undef res_close
void res_close(void);
void
res_close(void)
{
__res_close();
}
#endif

37
libc/dns/resolv/__res_send.c
View File

@@ -1,37 +0,0 @@
/* $NetBSD: __res_send.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */
/*
* written by matthew green, 22/04/97.
* public domain.
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: __res_send.c,v 1.4 2005/09/13 01:44:10 christos Exp $");
#endif
#if defined(__indr_reference)
__indr_reference(__res_send, res_send)
#else
#include <sys/types.h>
#include <netinet/in.h>
#ifdef ANDROID_CHANGES
#include "resolv_private.h"
#else
#include <resolv.h>
#endif
/* XXX THIS IS A MESS! SEE <resolv.h> XXX */
#undef res_send
int res_send(const u_char *, int, u_char *, int);
int
res_send(const u_char *buf, int buflen, u_char *ans, int anssiz)
{
return __res_send(buf, buflen, ans, anssiz);
}
#endif

4
libc/include/fcntl.h
View File

@@ -82,9 +82,9 @@ extern ssize_t vmsplice(int, const struct iovec*, size_t, unsigned int);
#if defined(__BIONIC_FORTIFY) #if defined(__BIONIC_FORTIFY)
extern int __open_2(const char*, int); extern int __open_2(const char*, int);
extern int __open_real(const char*, int, ...) __asm__(__USER_LABEL_PREFIX__ "open"); extern int __open_real(const char*, int, ...) __RENAME(open);
extern int __openat_2(int, const char*, int); extern int __openat_2(int, const char*, int);
extern int __openat_real(int, const char*, int, ...) __asm__(__USER_LABEL_PREFIX__ "openat"); extern int __openat_real(int, const char*, int, ...) __RENAME(openat);
__errordecl(__creat_missing_mode, "called with O_CREAT, but missing mode"); __errordecl(__creat_missing_mode, "called with O_CREAT, but missing mode");
__errordecl(__creat_too_many_args, "too many arguments"); __errordecl(__creat_too_many_args, "too many arguments");

2
libc/include/stdio.h
View File

@@ -408,7 +408,7 @@ int sprintf(char *dest, const char *format, ...)
#endif #endif
extern char* __fgets_chk(char*, int, FILE*, size_t); extern char* __fgets_chk(char*, int, FILE*, size_t);
extern char* __fgets_real(char*, int, FILE*) __asm__(__USER_LABEL_PREFIX__ "fgets"); extern char* __fgets_real(char*, int, FILE*) __RENAME(fgets);
__errordecl(__fgets_too_big_error, "fgets called with size bigger than buffer"); __errordecl(__fgets_too_big_error, "fgets called with size bigger than buffer");
__errordecl(__fgets_too_small_error, "fgets called with size less than zero"); __errordecl(__fgets_too_small_error, "fgets called with size less than zero");

6
libc/include/string.h
View File

@@ -180,8 +180,7 @@ void* memset(void *s, int c, size_t n) {
return __builtin___memset_chk(s, c, n, __bos0(s)); return __builtin___memset_chk(s, c, n, __bos0(s));
} }
extern size_t __strlcpy_real(char* __restrict, const char* __restrict, size_t) extern size_t __strlcpy_real(char* __restrict, const char* __restrict, size_t) __RENAME(strlcpy);
__asm__(__USER_LABEL_PREFIX__ "strlcpy");
extern size_t __strlcpy_chk(char *, const char *, size_t, size_t); extern size_t __strlcpy_chk(char *, const char *, size_t, size_t);
__BIONIC_FORTIFY_INLINE __BIONIC_FORTIFY_INLINE
@@ -204,8 +203,7 @@ size_t strlcpy(char* __restrict dest, const char* __restrict src, size_t size) {
return __strlcpy_chk(dest, src, size, bos); return __strlcpy_chk(dest, src, size, bos);
} }
extern size_t __strlcat_real(char* __restrict, const char* __restrict, size_t) extern size_t __strlcat_real(char* __restrict, const char* __restrict, size_t) __RENAME(strlcat);
__asm__(__USER_LABEL_PREFIX__ "strlcat");
extern size_t __strlcat_chk(char* __restrict, const char* __restrict, size_t, size_t); extern size_t __strlcat_chk(char* __restrict, const char* __restrict, size_t, size_t);

96
libc/include/sys/cdefs.h
View File

@@ -267,20 +267,6 @@
#endif /* NO_KERNEL_RCSIDS */ #endif /* NO_KERNEL_RCSIDS */
#endif /* _KERNEL */ #endif /* _KERNEL */
#if !defined(_STANDALONE) && !defined(_KERNEL)
#ifdef __GNUC__
#define __RENAME(x) ___RENAME(x)
#else
#ifdef __lint__
#define __RENAME(x) __symbolrename(x)
#else
#error "No function renaming possible"
#endif /* __lint__ */
#endif /* __GNUC__ */
#else /* _STANDALONE || _KERNEL */
#define __RENAME(x) no renaming in kernel or standalone environment
#endif
/* /*
* A barrier to stop the optimizer from moving code or assume live * A barrier to stop the optimizer from moving code or assume live
* register values. This is gcc specific, the version is more or less * register values. This is gcc specific, the version is more or less
@@ -359,60 +345,15 @@
#endif #endif
/* /*
* Macros for manipulating "link sets". Link sets are arrays of pointers * Some BSD source needs these macros.
* to objects, which are gathered up by the linker. * Originally they embedded the rcs versions of each source file
* * in the generated binary. We strip strings during build anyway,.
* Object format-specific code has provided us with the following macros:
*
* __link_set_add_text(set, sym)
* Add a reference to the .text symbol `sym' to `set'.
*
* __link_set_add_rodata(set, sym)
* Add a reference to the .rodata symbol `sym' to `set'.
*
* __link_set_add_data(set, sym)
* Add a reference to the .data symbol `sym' to `set'.
*
* __link_set_add_bss(set, sym)
* Add a reference to the .bss symbol `sym' to `set'.
*
* __link_set_decl(set, ptype)
* Provide an extern declaration of the set `set', which
* contains an array of the pointer type `ptype'. This
* macro must be used by any code which wishes to reference
* the elements of a link set.
*
* __link_set_start(set)
* This points to the first slot in the link set.
*
* __link_set_end(set)
* This points to the (non-existent) slot after the last
* entry in the link set.
*
* __link_set_count(set)
* Count the number of entries in link set `set'.
*
* In addition, we provide the following macros for accessing link sets:
*
* __link_set_foreach(pvar, set)
* Iterate over the link set `set'. Because a link set is
* an array of pointers, pvar must be declared as "type **pvar",
* and the actual entry accessed as "*pvar".
*
* __link_set_entry(set, idx)
* Access the link set entry at index `idx' from set `set'.
*/ */
#define __link_set_foreach(pvar, set) \ #define __IDSTRING(_prefix,_s) /* nothing */
for (pvar = __link_set_start(set); pvar < __link_set_end(set); pvar++) #define __COPYRIGHT(_s) /* nothing */
#define __FBSDID(_s) /* nothing */
#define __link_set_entry(set, idx) (__link_set_begin(set)[idx]) #define __RCSID(_s) /* nothing */
#define __SCCSID(_s) /* nothing */
/*
* Some of the FreeBSD sources used in Bionic need this.
* Originally, this is used to embed the rcs versions of each source file
* in the generated binary. We certainly don't want this in Bionic.
*/
#define __FBSDID(s) /* nothing */
/*- /*-
* The following definitions are an extension of the behavior originally * The following definitions are an extension of the behavior originally
@@ -570,11 +511,24 @@
#endif #endif
#define __bos0(s) __builtin_object_size((s), 0) #define __bos0(s) __builtin_object_size((s), 0)
#define __BIONIC_FORTIFY_INLINE \ #define __BIONIC_FORTIFY_INLINE extern __inline__ __always_inline __attribute__((gnu_inline))
extern __inline__ \
__attribute__ ((always_inline)) \
__attribute__ ((gnu_inline))
#endif #endif
#define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1) #define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1)
/* Used to tag non-static symbols that are private and never exposed by the shared library. */
#define __LIBC_HIDDEN__ __attribute__((visibility("hidden")))
/* Like __LIBC_HIDDEN__, but preserves binary compatibility for LP32. */
#ifdef __LP64__
#define __LIBC64_HIDDEN__ __LIBC_HIDDEN__
#else
#define __LIBC64_HIDDEN__ __LIBC_ABI_PUBLIC__
#endif
/* Used to tag non-static symbols that are public and exposed by the shared library. */
#define __LIBC_ABI_PUBLIC__ __attribute__((visibility ("default")))
/* Used to rename functions so that the compiler emits a call to 'x' rather than the function this was applied to. */
#define __RENAME(x) __asm__(#x)
#endif /* !_SYS_CDEFS_H_ */ #endif /* !_SYS_CDEFS_H_ */

94
libc/include/sys/cdefs_elf.h
View File

@@ -30,27 +30,13 @@
#ifndef _SYS_CDEFS_ELF_H_ #ifndef _SYS_CDEFS_ELF_H_
#define _SYS_CDEFS_ELF_H_ #define _SYS_CDEFS_ELF_H_
#ifdef __LEADING_UNDERSCORE #define __strong_alias(alias, sym) \
#define _C_LABEL(x) __CONCAT(_,x) __asm__(".global " #alias "\n" \
#define _C_LABEL_STRING(x) "_"x #alias " = " #sym);
#else
#define _C_LABEL(x) x
#define _C_LABEL_STRING(x) x
#endif
#define ___RENAME(x) __asm__(___STRING(_C_LABEL(x)))
#define __indr_reference(sym,alias) /* nada, since we do weak refs */
#define __strong_alias(alias,sym) \
__asm__(".global " _C_LABEL_STRING(#alias) "\n" \
_C_LABEL_STRING(#alias) " = " _C_LABEL_STRING(#sym));
#define __weak_alias(alias,sym) \ #define __weak_alias(alias,sym) \
__asm__(".weak " _C_LABEL_STRING(#alias) "\n" \ __asm__(".weak " #alias "\n" \
_C_LABEL_STRING(#alias) " = " _C_LABEL_STRING(#sym)); #alias " = " #sym);
#define __weak_extern(sym) \
__asm__(".weak " _C_LABEL_STRING(#sym));
/* We use __warnattr instead of __warn_references. /* We use __warnattr instead of __warn_references.
* TODO: remove this and put an empty definition in one of the upstream-* compatibility headers. * TODO: remove this and put an empty definition in one of the upstream-* compatibility headers.
@@ -58,74 +44,4 @@
#define __warn_references(sym,msg) \ #define __warn_references(sym,msg) \
/*__asm__(".section .gnu.warning." #sym "\n\t.ascii \"" msg "\"\n\t.text");*/ /*__asm__(".section .gnu.warning." #sym "\n\t.ascii \"" msg "\"\n\t.text");*/
#define __SECTIONSTRING(_sec, _str) \
__asm__(".section " #_sec "\n\t.asciz \"" _str "\"\n\t.previous")
/* Used to tag non-static symbols that are private and never exposed by the shared library. */
#define __LIBC_HIDDEN__ __attribute__((visibility ("hidden")))
/* Like __LIBC_HIDDEN__, but preserves binary compatibility for LP32. */
#ifdef __LP64__
#define __LIBC64_HIDDEN__ __LIBC_HIDDEN__
#else
#define __LIBC64_HIDDEN__ __LIBC_ABI_PUBLIC__
#endif
/* Used to tag non-static symbols that are public and exposed by the shared library. */
#define __LIBC_ABI_PUBLIC__ __attribute__((visibility ("default")))
#define __IDSTRING(_n,_s) __SECTIONSTRING(.ident,_s)
#define __RCSID(_s) __IDSTRING(rcsid,_s)
#define __SCCSID(_s)
#define __SCCSID2(_s)
#if 0 /* XXX userland __COPYRIGHTs have \ns in them */
#define __COPYRIGHT(_s) __SECTIONSTRING(.copyright,_s)
#else
#define __COPYRIGHT(_s) \
static const char copyright[] \
__attribute__((__unused__,__section__(".copyright"))) = _s
#endif
#define __KERNEL_RCSID(_n, _s) __RCSID(_s)
#define __KERNEL_SCCSID(_n, _s)
#if 0 /* XXX see above */
#define __KERNEL_COPYRIGHT(_n, _s) __COPYRIGHT(_s)
#else
#define __KERNEL_COPYRIGHT(_n, _s) __SECTIONSTRING(.copyright, _s)
#endif
#ifndef __lint__
#define __link_set_make_entry(set, sym) \
static void const * const __link_set_##set##_sym_##sym \
__section("link_set_" #set) __used = &sym
#define __link_set_make_entry2(set, sym, n) \
static void const * const __link_set_##set##_sym_##sym##_##n \
__section("link_set_" #set) __used = &sym[n]
#else
#define __link_set_make_entry(set, sym) \
extern void const * const __link_set_##set##_sym_##sym
#define __link_set_make_entry2(set, sym, n) \
extern void const * const __link_set_##set##_sym_##sym##_##n
#endif /* __lint__ */
#define __link_set_add_text(set, sym) __link_set_make_entry(set, sym)
#define __link_set_add_rodata(set, sym) __link_set_make_entry(set, sym)
#define __link_set_add_data(set, sym) __link_set_make_entry(set, sym)
#define __link_set_add_bss(set, sym) __link_set_make_entry(set, sym)
#define __link_set_add_text2(set, sym, n) __link_set_make_entry2(set, sym, n)
#define __link_set_add_rodata2(set, sym, n) __link_set_make_entry2(set, sym, n)
#define __link_set_add_data2(set, sym, n) __link_set_make_entry2(set, sym, n)
#define __link_set_add_bss2(set, sym, n) __link_set_make_entry2(set, sym, n)
#define __link_set_decl(set, ptype) \
extern ptype * const __start_link_set_##set[]; \
extern ptype * const __stop_link_set_##set[] \
#define __link_set_start(set) (__start_link_set_##set)
#define __link_set_end(set) (__stop_link_set_##set)
#define __link_set_count(set) \
(__link_set_end(set) - __link_set_start(set))
#endif /* !_SYS_CDEFS_ELF_H_ */ #endif /* !_SYS_CDEFS_ELF_H_ */

3
libc/include/sys/socket.h
View File

@@ -294,8 +294,7 @@ __socketcall ssize_t recvfrom(int, void*, size_t, int, const struct sockaddr*, s
#if defined(__BIONIC_FORTIFY) #if defined(__BIONIC_FORTIFY)
__errordecl(__recvfrom_error, "recvfrom called with size bigger than buffer"); __errordecl(__recvfrom_error, "recvfrom called with size bigger than buffer");
extern ssize_t __recvfrom_chk(int, void*, size_t, size_t, int, const struct sockaddr*, socklen_t*); extern ssize_t __recvfrom_chk(int, void*, size_t, size_t, int, const struct sockaddr*, socklen_t*);
extern ssize_t __recvfrom_real(int, void*, size_t, int, const struct sockaddr*, socklen_t*) extern ssize_t __recvfrom_real(int, void*, size_t, int, const struct sockaddr*, socklen_t*) __RENAME(recvfrom);
__asm__(__USER_LABEL_PREFIX__ "recvfrom");
__BIONIC_FORTIFY_INLINE __BIONIC_FORTIFY_INLINE
ssize_t recvfrom(int fd, void* buf, size_t len, int flags, const struct sockaddr* src_addr, socklen_t* addr_len) { ssize_t recvfrom(int fd, void* buf, size_t len, int flags, const struct sockaddr* src_addr, socklen_t* addr_len) {

2
libc/include/sys/stat.h
View File

@@ -162,7 +162,7 @@ extern mode_t umask(mode_t);
#if defined(__BIONIC_FORTIFY) #if defined(__BIONIC_FORTIFY)
extern mode_t __umask_chk(mode_t); extern mode_t __umask_chk(mode_t);
extern mode_t __umask_real(mode_t) __asm__(__USER_LABEL_PREFIX__ "umask"); extern mode_t __umask_real(mode_t) __RENAME(umask);
__errordecl(__umask_invalid_mode, "umask called with invalid mode"); __errordecl(__umask_invalid_mode, "umask called with invalid mode");
__BIONIC_FORTIFY_INLINE __BIONIC_FORTIFY_INLINE

3
libc/include/unistd.h
View File

@@ -201,8 +201,7 @@ extern int tcsetpgrp(int fd, pid_t _pid);
extern ssize_t __read_chk(int, void*, size_t, size_t); extern ssize_t __read_chk(int, void*, size_t, size_t);
__errordecl(__read_dest_size_error, "read called with size bigger than destination"); __errordecl(__read_dest_size_error, "read called with size bigger than destination");
__errordecl(__read_count_toobig_error, "read called with count > SSIZE_MAX"); __errordecl(__read_count_toobig_error, "read called with count > SSIZE_MAX");
extern ssize_t __read_real(int, void*, size_t) extern ssize_t __read_real(int, void*, size_t) __RENAME(read);
__asm__(__USER_LABEL_PREFIX__ "read");
__BIONIC_FORTIFY_INLINE __BIONIC_FORTIFY_INLINE
ssize_t read(int fd, void* buf, size_t count) { ssize_t read(int fd, void* buf, size_t count) {