summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7eb9b6c)
raw | patch | inline | side by side (parent: 7eb9b6c)
author | Elliott Hughes <enh@google.com> | |
Sat, 20 Dec 2014 03:30:11 +0000 (19:30 -0800) | ||
committer | Elliott Hughes <enh@google.com> | |
Sat, 20 Dec 2014 03:30:11 +0000 (19:30 -0800) |
Change-Id: I1e3097f745b526db448bf72fbc05fb2ba23929a0
index 6f238a93d728d313eb1a632925f1a1e10a0b40c7..21d59fa57a87789eab19625a28eac5ab90390b8c 100644 (file)
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
#define __GNUC_PREREQ(x, y) 0
#endif
-#include <sys/cdefs_elf.h>
+#define __strong_alias(alias, sym) \
+ __asm__(".global " #alias "\n" \
+ #alias " = " #sym);
#if defined(__cplusplus)
#define __BEGIN_DECLS extern "C" {
#endif
#endif /* !(__STDC_VERSION__ >= 199901L) */
-#if defined(_KERNEL)
-#if defined(NO_KERNEL_RCSIDS)
-#undef __KERNEL_RCSID
-#define __KERNEL_RCSID(_n, _s) /* nothing */
-#endif /* NO_KERNEL_RCSIDS */
-#endif /* _KERNEL */
-
/*
* A barrier to stop the optimizer from moving code or assume live
* 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
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $NetBSD: cdefs_elf.h,v 1.22 2005/02/26 22:25:34 perry Exp $ */
-
-/*
- * Copyright (c) 1995, 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
- * School of Computer Science
- * Carnegie Mellon University
- * Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#ifndef _SYS_CDEFS_ELF_H_
-#define _SYS_CDEFS_ELF_H_
-
-#define __strong_alias(alias, sym) \
- __asm__(".global " #alias "\n" \
- #alias " = " #sym);
-
-/* We use __warnattr instead of __warn_references.
- * TODO: remove this and put an empty definition in one of the upstream-* compatibility headers.
- */
-#define __warn_references(sym,msg) \
- /*__asm__(".section .gnu.warning." #sym "\n\t.ascii \"" msg "\"\n\t.text");*/
-
-#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 8386ba5fcb8401f162991fee669e9cab7e179f72..8783467c11ea68466507ed3a4aa8f3375ec823b3 100644 (file)
/* Ignore all __weak_alias in OpenBSD. */
#define __weak_alias(alias,sym)
+/* Ignore all __warn_references in OpenBSD. */
+#define __warn_references(sym,msg)
+
/* OpenBSD's <ctype.h> uses these names, which conflicted with stlport.
* Additionally, we changed the numeric/digit type from N to D for libcxx.
*/
diff --git a/libm/freebsd-compat.h b/libm/freebsd-compat.h
index 1481cc224ef67175d310884d9b1c6251b5c0916f..a4dd6c2c771f06e6b09847d39b6dbf416eea7e85 100644 (file)
--- a/libm/freebsd-compat.h
+++ b/libm/freebsd-compat.h
#define __strong_reference(sym,aliassym) \
extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)))
+#define __warn_references(sym,msg) /* ignored */
+
/* digittoint is in BSD's <ctype.h>. */
int digittoint(char ch);