From 48273534c7aa6552c9155366a39f54ce10653c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Thu, 16 Apr 2020 14:17:15 +0900 Subject: [PATCH] Support for FreeBSD FreeBSD's is broken. Cygwin is also affected by that. We need to avoid using them. See also: https://github.com/freebsd/freebsd/commit/d1c67819db000c02d3a9c79f3651c10aeedad1a0 https://sourceware.org/git/?p=newlib-cygwin.git;a=commit;f=newlib/libc/include/sys/cdefs.h;h=44d6d53977e6bc82c2b1e6dbe8ae7f310b260604 --- include/ruby/3/has/attribute.h | 12 +++++++++++- include/ruby/3/has/builtin.h | 15 +++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/include/ruby/3/has/attribute.h b/include/ruby/3/has/attribute.h index 14c4ff5596..39ce321a4f 100644 --- a/include/ruby/3/has/attribute.h +++ b/include/ruby/3/has/attribute.h @@ -24,8 +24,18 @@ #include "ruby/3/compiler_since.h" #include "ruby/3/token_paste.h" +#ifndef __has_attribute +# /* Don't bother. */ +#elif RUBY3_COMPILER_IS(GCC) && ! __has_attribute(pure) +# /* FreeBSD's defines its own *broken* version of +# * __has_attribute. Cygwin copied that content to be a victim of the broken- +# * ness. We don't take them into account. */ +#else +# define RUBY3_HAVE___HAS_ATTRIBUTE 1 +#endif + /** Wraps (or simulates) `__has_attribute`. */ -#if defined(__has_attribute) +#if defined(RUBY3_HAVE___HAS_ATTRIBUTE) # define RUBY3_HAS_ATTRIBUTE(_) __has_attribute(_) #elif RUBY3_COMPILER_IS(GCC) diff --git a/include/ruby/3/has/builtin.h b/include/ruby/3/has/builtin.h index 92a528d022..cce6435881 100644 --- a/include/ruby/3/has/builtin.h +++ b/include/ruby/3/has/builtin.h @@ -24,11 +24,22 @@ #include "ruby/3/compiler_since.h" #include "ruby/3/token_paste.h" -/** Wraps (or simulates) `__has_builtin`. */ -#if defined(__has_builtin) && ! RUBY3_COMPILER_IS(Intel) +#ifndef __has_builtin +# /* Don't bother. */ +#elif RUBY3_COMPILER_IS(Intel) # /* :TODO: Intel C Compiler has __has_builtin (since 19.1 maybe?), and is # * reportedly broken. We have to skip them. However the situation can # * change. They might improve someday. We need to revisit here later. */ +#elif RUBY3_COMPILER_IS(GCC) && ! __has_builtin(__builtin_alloca) +# /* FreeBSD's defines its own *broken* version of __has_builtin. +# * Cygwin copied that content to be a victim of the broken-ness. We don't +# * take them into account. */ +#else +# define RUBY3_HAVE___HAS_BUILTIN 1 +#endif + +/** Wraps (or simulates) `__has_builtin`. */ +#if defined(RUBY3_HAVE___HAS_BUILTIN) # define RUBY3_HAS_BUILTIN(_) __has_builtin(_) #elif RUBY3_COMPILER_IS(GCC)