]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'compiler-attributes/compiler-attributes'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 22:54:07 +0000 (08:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 22:54:07 +0000 (08:54 +1000)
# Conflicts:
# include/linux/compiler_attributes.h

1  2 
include/linux/compiler_attributes.h

index 2487be0e71994773d6ea12c188ff7837a7795053,7b1fa5c3016911e6cc3039bc666bbd83bba66afc..67c5667f804278556f5bb94b1b46957e59c54c19
  # 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