From 6a10a3e8d489d7b4dcffd6b4c63cee77e73e2535 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sun, 27 Feb 2022 14:32:38 +0100 Subject: [PATCH] Merge from gnulib * m4/gnulib-common.m4 (gl_COMMON_BODY): * lib/gnulib.mk.in (CXXCPP): * lib/cdefs.h: Updated with admin/merge-gnulib. (This is in preparation to adding the nanosleep module later.) --- lib/cdefs.h | 4 +++- lib/gnulib.mk.in | 1 - m4/gnulib-common.m4 | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/cdefs.h b/lib/cdefs.h index 44d3826bca9..cb2514504f1 100644 --- a/lib/cdefs.h +++ b/lib/cdefs.h @@ -41,7 +41,9 @@ Similarly for __has_builtin, etc. */ #if (defined __has_attribute \ && (!defined __clang_minor__ \ - || 3 < __clang_major__ + (5 <= __clang_minor__))) + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))) # define __glibc_has_attribute(attr) __has_attribute (attr) #else # define __glibc_has_attribute(attr) 0 diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index 6b90a80f64a..3a9f5b9818e 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -207,7 +207,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CRYPTOLIB = @CRYPTOLIB@ CXX = @CXX@ -CXXCPP = @CXXCPP@ CXXFLAGS = @CXXFLAGS@ CYGWIN_OBJ = @CYGWIN_OBJ@ C_SWITCH_MACHINE = @C_SWITCH_MACHINE@ diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index dbc40796148..c5ced04f181 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -69,7 +69,9 @@ AC_DEFUN([gl_COMMON_BODY], [ [/* Attributes. */ #if (defined __has_attribute \ && (!defined __clang_minor__ \ - || 3 < __clang_major__ + (5 <= __clang_minor__))) + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))) # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr -- 2.39.5