From d98277fd170f238ec97972c27d96fe5db3ed0929 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 30 Jul 2014 17:11:49 -0600 Subject: [PATCH] test-open: port to cygwin, which lacks Fortify On cygwin, with gcc 4.8.3, I get this compilation warning: In file included from ../../gltests/test-open.c:35:0: ../../gltests/test-open.h:35:1: warning: always_inline function might not be inlinable [-Wattributes] test_open (int (*func) (char const *, int, ...), bool print) ^ On that platform, there are no Fortify enhancements, and the internal macro __always_inline is always defined to turn on the gcc attribute, contrary to our needs. Since relying on a __ prefix is already risky, it's better to limit the workaround of commit d6ba92ea to just glibc. * tests/test-open.h (ALWAYS_INLINE): New macro. (__always_inline): Don't abuse internal symbol on non-glibc. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ tests/test-open.h | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73a6c0369b..f4d90224ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-07-30 Eric Blake + + test-open: port to cygwin, which lacks Fortify + * tests/test-open.h (ALWAYS_INLINE): New macro. + (__always_inline): Don't abuse internal symbol on non-glibc. + 2014-07-19 Eli Zaretskii localename: Enforce declarations before statements. diff --git a/tests/test-open.h b/tests/test-open.h index d7bd5afc49..1807c90376 100644 --- a/tests/test-open.h +++ b/tests/test-open.h @@ -21,8 +21,10 @@ around a glibc bug whereby 'open' cannot be used as a function pointer when _FORTIFY_SOURCE is positive. */ -#ifndef __always_inline -#define __always_inline +#if __GLIBC__ && defined __always_inline +# define ALWAYS_INLINE __always_inline +#else +# define ALWAYS_INLINE #endif /* This file is designed to test both open(n,buf[,mode]) and @@ -31,7 +33,7 @@ appropriate headers are already included. If PRINT, warn before skipping symlink tests with status 77. */ -static __always_inline int +static ALWAYS_INLINE int test_open (int (*func) (char const *, int, ...), bool print) { int fd; -- 2.39.5