commit b5cba6081bc9179d3ea2aa1bfd77dd8de1c88525
author Nick Kralevich <nnk@google.com> Mon Oct 06 23:21:03 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 06 23:21:04 2014 +0000
tree 6553458890519bd5a022522ac0c957c1e9e6ab55
parent 9969fecad23edebcbc4f32a50dc65a2876a2478f
parent 1aaa17802c92d99ae170245c2b2f15a6c27b133e

Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"

libc/include/sys/cdefs.h

diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h
index 5082327..6f238a9 100644
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
@@ -53,6 +53,9 @@
 #ifndef __has_builtin
 #define __has_builtin(x)        0
 #endif
+#ifndef __has_attribute
+#define __has_attribute(x)      0
+#endif
 
 
 /*
@@ -534,8 +537,12 @@
 #endif
 #define __bos0(s) __builtin_object_size((s), 0)
 
+#if __GNUC_PREREQ(4,3) || __has_attribute(__artificial__)
+#define __BIONIC_FORTIFY_INLINE extern __inline__ __always_inline __attribute__((gnu_inline)) __attribute__((__artificial__))
+#else
 #define __BIONIC_FORTIFY_INLINE extern __inline__ __always_inline __attribute__((gnu_inline))
 #endif
+#endif
 #define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1)
 
 /* Used to tag non-static symbols that are private and never exposed by the shared library. */

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 1358800..9759c71 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -152,11 +152,10 @@
   $(foreach test,1 2, \
     $(eval fortify$(test)-tests-$(compiler)_cflags := \
       $(test_cflags) \
+      -Wno-error \
       -U_FORTIFY_SOURCE \
       -D_FORTIFY_SOURCE=$(test) \
       -DTEST_NAME=Fortify$(test)_$(compiler)); \
-    $(eval fortify$(test)-tests-$(compiler)_cflags_host := \
-      -Wno-error); \
     $(eval fortify$(test)-tests-$(compiler)_src_files := \
       fortify_test.cpp); \
     $(eval fortify_libs += fortify$(test)-tests-$(compiler)); \