Pre-r13b modifications.
Includes:
a019096 cherry-pick fix to make __func__ C99 compliant.
diff --git a/README.chromium b/README.chromium
index 3457a2a..92780f4 100644
--- a/README.chromium
+++ b/README.chromium
@@ -10,3 +10,5 @@
Local Modifications:
- Removed everything below android-16 from platforms/
+ - Cherry-picked __func__ fix from upstream bionic
+ https://android-review.googlesource.com/#/c/250323/2
diff --git a/platforms/android-16/arch-arm/usr/include/assert.h b/platforms/android-16/arch-arm/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-16/arch-arm/usr/include/assert.h
+++ b/platforms/android-16/arch-arm/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-16/arch-arm/usr/include/sys/cdefs.h b/platforms/android-16/arch-arm/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-16/arch-arm/usr/include/sys/cdefs.h
+++ b/platforms/android-16/arch-arm/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-16/arch-mips/usr/include/assert.h b/platforms/android-16/arch-mips/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-16/arch-mips/usr/include/assert.h
+++ b/platforms/android-16/arch-mips/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-16/arch-mips/usr/include/sys/cdefs.h b/platforms/android-16/arch-mips/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-16/arch-mips/usr/include/sys/cdefs.h
+++ b/platforms/android-16/arch-mips/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-16/arch-x86/usr/include/assert.h b/platforms/android-16/arch-x86/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-16/arch-x86/usr/include/assert.h
+++ b/platforms/android-16/arch-x86/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-16/arch-x86/usr/include/sys/cdefs.h b/platforms/android-16/arch-x86/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-16/arch-x86/usr/include/sys/cdefs.h
+++ b/platforms/android-16/arch-x86/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-17/arch-arm/usr/include/assert.h b/platforms/android-17/arch-arm/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-17/arch-arm/usr/include/assert.h
+++ b/platforms/android-17/arch-arm/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-17/arch-arm/usr/include/sys/cdefs.h b/platforms/android-17/arch-arm/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-17/arch-arm/usr/include/sys/cdefs.h
+++ b/platforms/android-17/arch-arm/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-17/arch-mips/usr/include/assert.h b/platforms/android-17/arch-mips/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-17/arch-mips/usr/include/assert.h
+++ b/platforms/android-17/arch-mips/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-17/arch-mips/usr/include/sys/cdefs.h b/platforms/android-17/arch-mips/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-17/arch-mips/usr/include/sys/cdefs.h
+++ b/platforms/android-17/arch-mips/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-17/arch-x86/usr/include/assert.h b/platforms/android-17/arch-x86/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-17/arch-x86/usr/include/assert.h
+++ b/platforms/android-17/arch-x86/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-17/arch-x86/usr/include/sys/cdefs.h b/platforms/android-17/arch-x86/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-17/arch-x86/usr/include/sys/cdefs.h
+++ b/platforms/android-17/arch-x86/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-18/arch-arm/usr/include/assert.h b/platforms/android-18/arch-arm/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-18/arch-arm/usr/include/assert.h
+++ b/platforms/android-18/arch-arm/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-18/arch-arm/usr/include/sys/cdefs.h b/platforms/android-18/arch-arm/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-18/arch-arm/usr/include/sys/cdefs.h
+++ b/platforms/android-18/arch-arm/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-18/arch-mips/usr/include/assert.h b/platforms/android-18/arch-mips/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-18/arch-mips/usr/include/assert.h
+++ b/platforms/android-18/arch-mips/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-18/arch-mips/usr/include/sys/cdefs.h b/platforms/android-18/arch-mips/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-18/arch-mips/usr/include/sys/cdefs.h
+++ b/platforms/android-18/arch-mips/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-18/arch-x86/usr/include/assert.h b/platforms/android-18/arch-x86/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-18/arch-x86/usr/include/assert.h
+++ b/platforms/android-18/arch-x86/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-18/arch-x86/usr/include/sys/cdefs.h b/platforms/android-18/arch-x86/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-18/arch-x86/usr/include/sys/cdefs.h
+++ b/platforms/android-18/arch-x86/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-19/arch-arm/usr/include/assert.h b/platforms/android-19/arch-arm/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-19/arch-arm/usr/include/assert.h
+++ b/platforms/android-19/arch-arm/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-19/arch-arm/usr/include/sys/cdefs.h b/platforms/android-19/arch-arm/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-19/arch-arm/usr/include/sys/cdefs.h
+++ b/platforms/android-19/arch-arm/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-19/arch-mips/usr/include/assert.h b/platforms/android-19/arch-mips/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-19/arch-mips/usr/include/assert.h
+++ b/platforms/android-19/arch-mips/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-19/arch-mips/usr/include/sys/cdefs.h b/platforms/android-19/arch-mips/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-19/arch-mips/usr/include/sys/cdefs.h
+++ b/platforms/android-19/arch-mips/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-19/arch-x86/usr/include/assert.h b/platforms/android-19/arch-x86/usr/include/assert.h
index 62470f5..ba17d5e 100644
--- a/platforms/android-19/arch-x86/usr/include/assert.h
+++ b/platforms/android-19/arch-x86/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-19/arch-x86/usr/include/sys/cdefs.h b/platforms/android-19/arch-x86/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-19/arch-x86/usr/include/sys/cdefs.h
+++ b/platforms/android-19/arch-x86/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-21/arch-arm/usr/include/assert.h b/platforms/android-21/arch-arm/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-21/arch-arm/usr/include/assert.h
+++ b/platforms/android-21/arch-arm/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-21/arch-arm/usr/include/sys/cdefs.h b/platforms/android-21/arch-arm/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-21/arch-arm/usr/include/sys/cdefs.h
+++ b/platforms/android-21/arch-arm/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-21/arch-arm64/usr/include/assert.h b/platforms/android-21/arch-arm64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-21/arch-arm64/usr/include/assert.h
+++ b/platforms/android-21/arch-arm64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-21/arch-arm64/usr/include/sys/cdefs.h b/platforms/android-21/arch-arm64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-21/arch-arm64/usr/include/sys/cdefs.h
+++ b/platforms/android-21/arch-arm64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-21/arch-mips/usr/include/assert.h b/platforms/android-21/arch-mips/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-21/arch-mips/usr/include/assert.h
+++ b/platforms/android-21/arch-mips/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-21/arch-mips/usr/include/sys/cdefs.h b/platforms/android-21/arch-mips/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-21/arch-mips/usr/include/sys/cdefs.h
+++ b/platforms/android-21/arch-mips/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-21/arch-mips64/usr/include/assert.h b/platforms/android-21/arch-mips64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-21/arch-mips64/usr/include/assert.h
+++ b/platforms/android-21/arch-mips64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-21/arch-mips64/usr/include/sys/cdefs.h b/platforms/android-21/arch-mips64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-21/arch-mips64/usr/include/sys/cdefs.h
+++ b/platforms/android-21/arch-mips64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-21/arch-x86/usr/include/assert.h b/platforms/android-21/arch-x86/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-21/arch-x86/usr/include/assert.h
+++ b/platforms/android-21/arch-x86/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-21/arch-x86/usr/include/sys/cdefs.h b/platforms/android-21/arch-x86/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-21/arch-x86/usr/include/sys/cdefs.h
+++ b/platforms/android-21/arch-x86/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-21/arch-x86_64/usr/include/assert.h b/platforms/android-21/arch-x86_64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-21/arch-x86_64/usr/include/assert.h
+++ b/platforms/android-21/arch-x86_64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-21/arch-x86_64/usr/include/sys/cdefs.h b/platforms/android-21/arch-x86_64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-21/arch-x86_64/usr/include/sys/cdefs.h
+++ b/platforms/android-21/arch-x86_64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-22/arch-arm/usr/include/assert.h b/platforms/android-22/arch-arm/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-22/arch-arm/usr/include/assert.h
+++ b/platforms/android-22/arch-arm/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-22/arch-arm/usr/include/sys/cdefs.h b/platforms/android-22/arch-arm/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-22/arch-arm/usr/include/sys/cdefs.h
+++ b/platforms/android-22/arch-arm/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-22/arch-arm64/usr/include/assert.h b/platforms/android-22/arch-arm64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-22/arch-arm64/usr/include/assert.h
+++ b/platforms/android-22/arch-arm64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-22/arch-arm64/usr/include/sys/cdefs.h b/platforms/android-22/arch-arm64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-22/arch-arm64/usr/include/sys/cdefs.h
+++ b/platforms/android-22/arch-arm64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-22/arch-mips/usr/include/assert.h b/platforms/android-22/arch-mips/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-22/arch-mips/usr/include/assert.h
+++ b/platforms/android-22/arch-mips/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-22/arch-mips/usr/include/sys/cdefs.h b/platforms/android-22/arch-mips/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-22/arch-mips/usr/include/sys/cdefs.h
+++ b/platforms/android-22/arch-mips/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-22/arch-mips64/usr/include/assert.h b/platforms/android-22/arch-mips64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-22/arch-mips64/usr/include/assert.h
+++ b/platforms/android-22/arch-mips64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-22/arch-mips64/usr/include/sys/cdefs.h b/platforms/android-22/arch-mips64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-22/arch-mips64/usr/include/sys/cdefs.h
+++ b/platforms/android-22/arch-mips64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-22/arch-x86/usr/include/assert.h b/platforms/android-22/arch-x86/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-22/arch-x86/usr/include/assert.h
+++ b/platforms/android-22/arch-x86/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-22/arch-x86/usr/include/sys/cdefs.h b/platforms/android-22/arch-x86/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-22/arch-x86/usr/include/sys/cdefs.h
+++ b/platforms/android-22/arch-x86/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-22/arch-x86_64/usr/include/assert.h b/platforms/android-22/arch-x86_64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-22/arch-x86_64/usr/include/assert.h
+++ b/platforms/android-22/arch-x86_64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-22/arch-x86_64/usr/include/sys/cdefs.h b/platforms/android-22/arch-x86_64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-22/arch-x86_64/usr/include/sys/cdefs.h
+++ b/platforms/android-22/arch-x86_64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-23/arch-arm/usr/include/assert.h b/platforms/android-23/arch-arm/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-23/arch-arm/usr/include/assert.h
+++ b/platforms/android-23/arch-arm/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-23/arch-arm/usr/include/sys/cdefs.h b/platforms/android-23/arch-arm/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-23/arch-arm/usr/include/sys/cdefs.h
+++ b/platforms/android-23/arch-arm/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-23/arch-arm64/usr/include/assert.h b/platforms/android-23/arch-arm64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-23/arch-arm64/usr/include/assert.h
+++ b/platforms/android-23/arch-arm64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-23/arch-arm64/usr/include/sys/cdefs.h b/platforms/android-23/arch-arm64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-23/arch-arm64/usr/include/sys/cdefs.h
+++ b/platforms/android-23/arch-arm64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-23/arch-mips/usr/include/assert.h b/platforms/android-23/arch-mips/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-23/arch-mips/usr/include/assert.h
+++ b/platforms/android-23/arch-mips/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-23/arch-mips/usr/include/sys/cdefs.h b/platforms/android-23/arch-mips/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-23/arch-mips/usr/include/sys/cdefs.h
+++ b/platforms/android-23/arch-mips/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-23/arch-mips64/usr/include/assert.h b/platforms/android-23/arch-mips64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-23/arch-mips64/usr/include/assert.h
+++ b/platforms/android-23/arch-mips64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-23/arch-mips64/usr/include/sys/cdefs.h b/platforms/android-23/arch-mips64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-23/arch-mips64/usr/include/sys/cdefs.h
+++ b/platforms/android-23/arch-mips64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-23/arch-x86/usr/include/assert.h b/platforms/android-23/arch-x86/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-23/arch-x86/usr/include/assert.h
+++ b/platforms/android-23/arch-x86/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-23/arch-x86/usr/include/sys/cdefs.h b/platforms/android-23/arch-x86/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-23/arch-x86/usr/include/sys/cdefs.h
+++ b/platforms/android-23/arch-x86/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-23/arch-x86_64/usr/include/assert.h b/platforms/android-23/arch-x86_64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-23/arch-x86_64/usr/include/assert.h
+++ b/platforms/android-23/arch-x86_64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-23/arch-x86_64/usr/include/sys/cdefs.h b/platforms/android-23/arch-x86_64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-23/arch-x86_64/usr/include/sys/cdefs.h
+++ b/platforms/android-23/arch-x86_64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-24/arch-arm/usr/include/assert.h b/platforms/android-24/arch-arm/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-24/arch-arm/usr/include/assert.h
+++ b/platforms/android-24/arch-arm/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-24/arch-arm/usr/include/sys/cdefs.h b/platforms/android-24/arch-arm/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-24/arch-arm/usr/include/sys/cdefs.h
+++ b/platforms/android-24/arch-arm/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-24/arch-arm64/usr/include/assert.h b/platforms/android-24/arch-arm64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-24/arch-arm64/usr/include/assert.h
+++ b/platforms/android-24/arch-arm64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-24/arch-arm64/usr/include/sys/cdefs.h b/platforms/android-24/arch-arm64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-24/arch-arm64/usr/include/sys/cdefs.h
+++ b/platforms/android-24/arch-arm64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-24/arch-mips/usr/include/assert.h b/platforms/android-24/arch-mips/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-24/arch-mips/usr/include/assert.h
+++ b/platforms/android-24/arch-mips/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-24/arch-mips/usr/include/sys/cdefs.h b/platforms/android-24/arch-mips/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-24/arch-mips/usr/include/sys/cdefs.h
+++ b/platforms/android-24/arch-mips/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-24/arch-mips64/usr/include/assert.h b/platforms/android-24/arch-mips64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-24/arch-mips64/usr/include/assert.h
+++ b/platforms/android-24/arch-mips64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-24/arch-mips64/usr/include/sys/cdefs.h b/platforms/android-24/arch-mips64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-24/arch-mips64/usr/include/sys/cdefs.h
+++ b/platforms/android-24/arch-mips64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-24/arch-x86/usr/include/assert.h b/platforms/android-24/arch-x86/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-24/arch-x86/usr/include/assert.h
+++ b/platforms/android-24/arch-x86/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-24/arch-x86/usr/include/sys/cdefs.h b/platforms/android-24/arch-x86/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-24/arch-x86/usr/include/sys/cdefs.h
+++ b/platforms/android-24/arch-x86/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
diff --git a/platforms/android-24/arch-x86_64/usr/include/assert.h b/platforms/android-24/arch-x86_64/usr/include/assert.h
index 361a5ff..afa3df1 100644
--- a/platforms/android-24/arch-x86_64/usr/include/assert.h
+++ b/platforms/android-24/arch-x86_64/usr/include/assert.h
@@ -53,7 +53,7 @@
#else
# define _assert(e) assert(e)
# if __ISO_C_VISIBLE >= 1999
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
+# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __PRETTY_FUNCTION__, #e))
# else
# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
# endif
diff --git a/platforms/android-24/arch-x86_64/usr/include/sys/cdefs.h b/platforms/android-24/arch-x86_64/usr/include/sys/cdefs.h
index 9a8dfdd..e857f11 100644
--- a/platforms/android-24/arch-x86_64/usr/include/sys/cdefs.h
+++ b/platforms/android-24/arch-x86_64/usr/include/sys/cdefs.h
@@ -246,20 +246,6 @@
#endif
#endif
-/*
- * C99 defines __func__ predefined identifier, which was made available
- * in GCC 2.95.
- */
-#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
-#if __GNUC_PREREQ(2, 6)
-#define __func__ __PRETTY_FUNCTION__
-#elif __GNUC_PREREQ(2, 4)
-#define __func__ __FUNCTION__
-#else
-#define __func__ ""
-#endif
-#endif /* !(__STDC_VERSION__ >= 199901L) */
-
#if defined(_KERNEL)
#if defined(NO_KERNEL_RCSIDS)
#undef __KERNEL_RCSID
