commit ce4a5cd5f3ee09fbc8dea7ffdfcd4fd097f8ed34
author Shih-wei Liao <sliao@google.com> Mon Aug 06 10:17:09 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 06 10:17:09 2012 -0700
tree 3811d661b0cfe1ab17fc91a029474d9ffc40db03
parent 924fd920137135729483d0beacea20d5a0552c15
parent 8173d76740cafc2ceb49d2fddf1ceabfaa823236

am 8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""

* commit '8173d76740cafc2ceb49d2fddf1ceabfaa823236':
  Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"

libc/include/sys/cdefs.h

diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h
index f088e33..987a5e3 100644
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
@@ -502,18 +502,11 @@
 #include <android/api-level.h>
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
-#if defined(__clang__)
-#define __BIONIC_FORTIFY_INLINE \
-    extern inline \
-    __attribute__ ((always_inline)) \
-    __attribute__ ((artificial))
-#else
 #define __BIONIC_FORTIFY_INLINE \
     extern inline \
     __attribute__ ((always_inline)) \
     __attribute__ ((gnu_inline)) \
     __attribute__ ((artificial))
-#endif
 #define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1)
 #endif