>From ec44eeef033cddfb0df8fba8bcf8a6a1777b7102 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 5 May 2020 00:48:48 -0700 Subject: [PATCH] Fix typos in recent attribute.h simplification Problem reported by Andreas Schwab in: https://lists.gnu.org/r/emacs-devel/2020-05/msg00650.html * src/conf_post.h (HAS_ATTR_no_sanitize): Define to false in case cpp is picky, fixing a longstanding glitch here. (ATTRIBUTE_NO_SANITIZE_ADDRESS, ATTRIBUTE_NO_SANITIZE_UNDEFINED): Use HAS_ATTRIBUTE, not __has_attribute. --- src/conf_post.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/conf_post.h b/src/conf_post.h index 953b783ebe..1ef4ff3342 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -77,6 +77,7 @@ Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020 Free Software # define HAS_ATTRIBUTE(a) HAS_ATTR_##a # define HAS_ATTR_cleanup GNUC_PREREQ (3, 4, 0) # define HAS_ATTR_no_address_safety_analysis false +# define HAS_ATTR_no_sanitize false # define HAS_ATTR_no_sanitize_address GNUC_PREREQ (4, 8, 0) # define HAS_ATTR_no_sanitize_undefined GNUC_PREREQ (4, 9, 0) #endif @@ -294,10 +295,10 @@ #define ATTRIBUTE_MALLOC_SIZE(args) ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE (args) /* Attribute of functions whose code should not have addresses sanitized. */ -#if __has_attribute (no_sanitize_address) +#if HAS_ATTRIBUTE (no_sanitize_address) # define ATTRIBUTE_NO_SANITIZE_ADDRESS \ __attribute__ ((no_sanitize_address)) ADDRESS_SANITIZER_WORKAROUND -#elif __has_attribute (no_address_safety_analysis) +#elif HAS_ATTRIBUTE (no_address_safety_analysis) # define ATTRIBUTE_NO_SANITIZE_ADDRESS \ __attribute__ ((no_address_safety_analysis)) ADDRESS_SANITIZER_WORKAROUND #else @@ -306,9 +307,9 @@ #define ATTRIBUTE_MALLOC_SIZE(args) ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE (args) /* Attribute of functions whose undefined behavior should not be sanitized. */ -#if __has_attribute (no_sanitize_undefined) +#if HAS_ATTRIBUTE (no_sanitize_undefined) # define ATTRIBUTE_NO_SANITIZE_UNDEFINED __attribute__ ((no_sanitize_undefined)) -#elif __has_attribute (no_sanitize) +#elif HAS_ATTRIBUTE (no_sanitize) # define ATTRIBUTE_NO_SANITIZE_UNDEFINED \ __attribute__ ((no_sanitize ("undefined"))) #else -- 2.17.1