From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 1 Sep 2021 22:54:07 +0000 (+1000)
Subject: Merge remote-tracking branch 'compiler-attributes/compiler-attributes'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c593be9f575962e3e03a04cfe15cd681fb1c5348;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'compiler-attributes/compiler-attributes'

# Conflicts:
#	include/linux/compiler_attributes.h
---

c593be9f575962e3e03a04cfe15cd681fb1c5348
diff --cc include/linux/compiler_attributes.h
index 2487be0e7199,7b1fa5c30169..67c5667f8042
--- a/include/linux/compiler_attributes.h
+++ b/include/linux/compiler_attributes.h
@@@ -33,10 -33,10 +33,11 @@@
  # define __GCC4_has_attribute___externally_visible__  1
  # define __GCC4_has_attribute___no_caller_saved_registers__ 0
  # define __GCC4_has_attribute___noclone__             1
 +# define __GCC4_has_attribute___no_profile_instrument_function__ 0
  # define __GCC4_has_attribute___nonstring__           0
 -# define __GCC4_has_attribute___no_sanitize_address__ (__GNUC_MINOR__ >= 8)
 -# define __GCC4_has_attribute___no_sanitize_undefined__ (__GNUC_MINOR__ >= 9)
 +# define __GCC4_has_attribute___no_sanitize_address__ 1
 +# define __GCC4_has_attribute___no_sanitize_undefined__ 1
+ # define __GCC4_has_attribute___no_sanitize_coverage__ 0
  # define __GCC4_has_attribute___fallthrough__         0
  #endif