aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2014-12-19 21:30:11 -0600
committerElliott Hughes2014-12-19 21:30:11 -0600
commit998f2d5a50adffcc0447912fb6a7af2dac7accf1 (patch)
treefd23600f7789cf9e5dee8c7e63eab45dbe8e1db5
parent7eb9b6c537c32280571fead8676634c3dfc6388e (diff)
downloadplatform-bionic-998f2d5a50adffcc0447912fb6a7af2dac7accf1.tar.gz
platform-bionic-998f2d5a50adffcc0447912fb6a7af2dac7accf1.tar.xz
platform-bionic-998f2d5a50adffcc0447912fb6a7af2dac7accf1.zip
Remove more BSD cruft from the public headers.
Change-Id: I1e3097f745b526db448bf72fbc05fb2ba23929a0
-rw-r--r--libc/include/sys/cdefs.h11
-rw-r--r--libc/include/sys/cdefs_elf.h43
-rw-r--r--libc/upstream-openbsd/android/include/openbsd-compat.h3
-rw-r--r--libm/freebsd-compat.h2
4 files changed, 8 insertions, 51 deletions
diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h
index 6f238a93..21d59fa5 100644
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
@@ -77,7 +77,9 @@
77#define __GNUC_PREREQ(x, y) 0 77#define __GNUC_PREREQ(x, y) 0
78#endif 78#endif
79 79
80#include <sys/cdefs_elf.h> 80#define __strong_alias(alias, sym) \
81 __asm__(".global " #alias "\n" \
82 #alias " = " #sym);
81 83
82#if defined(__cplusplus) 84#if defined(__cplusplus)
83#define __BEGIN_DECLS extern "C" { 85#define __BEGIN_DECLS extern "C" {
@@ -263,13 +265,6 @@
263#endif 265#endif
264#endif /* !(__STDC_VERSION__ >= 199901L) */ 266#endif /* !(__STDC_VERSION__ >= 199901L) */
265 267
266#if defined(_KERNEL)
267#if defined(NO_KERNEL_RCSIDS)
268#undef __KERNEL_RCSID
269#define __KERNEL_RCSID(_n, _s) /* nothing */
270#endif /* NO_KERNEL_RCSIDS */
271#endif /* _KERNEL */
272
273/* 268/*
274 * A barrier to stop the optimizer from moving code or assume live 269 * A barrier to stop the optimizer from moving code or assume live
275 * register values. This is gcc specific, the version is more or less 270 * register values. This is gcc specific, the version is more or less
diff --git a/libc/include/sys/cdefs_elf.h b/libc/include/sys/cdefs_elf.h
deleted file mode 100644
index a40a867b..00000000
--- a/libc/include/sys/cdefs_elf.h
+++ /dev/null
@@ -1,43 +0,0 @@
1/* $NetBSD: cdefs_elf.h,v 1.22 2005/02/26 22:25:34 perry Exp $ */
2
3/*
4 * Copyright (c) 1995, 1996 Carnegie-Mellon University.
5 * All rights reserved.
6 *
7 * Author: Chris G. Demetriou
8 *
9 * Permission to use, copy, modify and distribute this software and
10 * its documentation is hereby granted, provided that both the copyright
11 * notice and this permission notice appear in all copies of the
12 * software, derivative works or modified versions, and any portions
13 * thereof, and that both notices appear in supporting documentation.
14 *
15 * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
16 * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
17 * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
18 *
19 * Carnegie Mellon requests users of this software to return to
20 *
21 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
22 * School of Computer Science
23 * Carnegie Mellon University
24 * Pittsburgh PA 15213-3890
25 *
26 * any improvements or extensions that they make and grant Carnegie the
27 * rights to redistribute these changes.
28 */
29
30#ifndef _SYS_CDEFS_ELF_H_
31#define _SYS_CDEFS_ELF_H_
32
33#define __strong_alias(alias, sym) \
34 __asm__(".global " #alias "\n" \
35 #alias " = " #sym);
36
37/* We use __warnattr instead of __warn_references.
38 * TODO: remove this and put an empty definition in one of the upstream-* compatibility headers.
39 */
40#define __warn_references(sym,msg) \
41 /*__asm__(".section .gnu.warning." #sym "\n\t.ascii \"" msg "\"\n\t.text");*/
42
43#endif /* !_SYS_CDEFS_ELF_H_ */
diff --git a/libc/upstream-openbsd/android/include/openbsd-compat.h b/libc/upstream-openbsd/android/include/openbsd-compat.h
index 8386ba5f..8783467c 100644
--- a/libc/upstream-openbsd/android/include/openbsd-compat.h
+++ b/libc/upstream-openbsd/android/include/openbsd-compat.h
@@ -35,6 +35,9 @@
35/* Ignore all __weak_alias in OpenBSD. */ 35/* Ignore all __weak_alias in OpenBSD. */
36#define __weak_alias(alias,sym) 36#define __weak_alias(alias,sym)
37 37
38/* Ignore all __warn_references in OpenBSD. */
39#define __warn_references(sym,msg)
40
38/* OpenBSD's <ctype.h> uses these names, which conflicted with stlport. 41/* OpenBSD's <ctype.h> uses these names, which conflicted with stlport.
39 * Additionally, we changed the numeric/digit type from N to D for libcxx. 42 * Additionally, we changed the numeric/digit type from N to D for libcxx.
40 */ 43 */
diff --git a/libm/freebsd-compat.h b/libm/freebsd-compat.h
index 1481cc22..a4dd6c2c 100644
--- a/libm/freebsd-compat.h
+++ b/libm/freebsd-compat.h
@@ -26,6 +26,8 @@
26#define __strong_reference(sym,aliassym) \ 26#define __strong_reference(sym,aliassym) \
27 extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))) 27 extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)))
28 28
29#define __warn_references(sym,msg) /* ignored */
30
29/* digittoint is in BSD's <ctype.h>. */ 31/* digittoint is in BSD's <ctype.h>. */
30int digittoint(char ch); 32int digittoint(char ch);
31 33