Message ID | 1349466169-20637-1-git-send-email-daniel.santos@pobox.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Fri, Oct 05, 2012 at 02:42:40PM -0500, danielfsantos@att.net wrote: > This helps to keep the file from getting confusing, removes one > duplicate version check and should encourage future editors to put new > macros where they belong. > > Signed-off-by: Daniel Santos <daniel.santos@pobox.com> > Acked-by: David Rientjes <rientjes@google.com> > --- > include/linux/compiler-gcc4.h | 20 +++++++++++--------- > 1 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h > index 8721704..4506d65 100644 > --- a/include/linux/compiler-gcc4.h > +++ b/include/linux/compiler-gcc4.h > @@ -13,6 +13,10 @@ > #define __must_check __attribute__((warn_unused_result)) > #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) > > +#if __GNUC_MINOR__ > 0 > +# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) > +#endif > + > #if __GNUC_MINOR__ >= 3 > /* Mark functions as cold. gcc will assume any path leading to a call > to them will be unlikely. This means a lot of manual unlikely()s > @@ -31,6 +35,12 @@ > > #define __linktime_error(message) __attribute__((__error__(message))) > > +#ifndef __CHECKER__ > +# define __compiletime_warning(message) __attribute__((warning(message))) > +# define __compiletime_error(message) __attribute__((error(message))) > +#endif /* __CHECKER__ */ > +#endif /* __GNUC_MINOR__ >= 3 */ > + > #if __GNUC_MINOR__ >= 5 > /* > * Mark a position in code as unreachable. This can be used to > @@ -46,8 +56,7 @@ > /* Mark a function definition as prohibited from being cloned. */ > #define __noclone __attribute__((__noclone__)) > > -#endif > -#endif > +#endif /* __GNUC_MINOR__ >= 5 */ > > #if __GNUC_MINOR__ >= 6 > /* > @@ -56,10 +65,3 @@ > #define __visible __attribute__((externally_visible)) > #endif > > -#if __GNUC_MINOR__ > 0 > -#define __compiletime_object_size(obj) __builtin_object_size(obj, 0) > -#endif > -#if __GNUC_MINOR__ >= 3 && !defined(__CHECKER__) This last hunk doesn't apply since mainline has a "4" above instead of "3". And it has had a "4" since it got added by 4a3127693001c so unless I'm missing something, how did the 3 appear in your patches? > -#define __compiletime_warning(message) __attribute__((warning(message))) > -#define __compiletime_error(message) __attribute__((error(message))) > -#endif > -- > 1.7.3.4 Thanks.
On 10/06/2012 12:42 PM, Borislav Petkov wrote: >> @@ -56,10 +65,3 @@ >> #define __visible __attribute__((externally_visible)) >> #endif >> >> -#if __GNUC_MINOR__ > 0 >> -#define __compiletime_object_size(obj) __builtin_object_size(obj, 0) >> -#endif >> -#if __GNUC_MINOR__ >= 3 && !defined(__CHECKER__) > > This last hunk doesn't apply since mainline has a "4" above instead of > "3". And it has had a "4" since it got added by 4a3127693001c so unless > I'm missing something, how did the 3 appear in your patches? These are based against -mm, where another commit is already in that changes it. I was told that since that commit was already in -mm, to not include it in the patch set: 6c620cf1536a0ce6a83ecaaaf05298dcc0f7d440 (committed 2012-09-27) This was probably (at least partially) the result of the fiasco I had with my email. -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 6 Oct 2012, Daniel Santos wrote: > These are based against -mm, where another commit is already in that > changes it. I was told that since that commit was already in -mm, to > not include it in the patch set: > > 6c620cf1536a0ce6a83ecaaaf05298dcc0f7d440 (committed 2012-09-27) > > This was probably (at least partially) the result of the fiasco I had > with my email. > Yeah, this patch applies fine on linux-next, which is the correct thing to do if you're building upon already queued patches. -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 8721704..4506d65 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h @@ -13,6 +13,10 @@ #define __must_check __attribute__((warn_unused_result)) #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) +#if __GNUC_MINOR__ > 0 +# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) +#endif + #if __GNUC_MINOR__ >= 3 /* Mark functions as cold. gcc will assume any path leading to a call to them will be unlikely. This means a lot of manual unlikely()s @@ -31,6 +35,12 @@ #define __linktime_error(message) __attribute__((__error__(message))) +#ifndef __CHECKER__ +# define __compiletime_warning(message) __attribute__((warning(message))) +# define __compiletime_error(message) __attribute__((error(message))) +#endif /* __CHECKER__ */ +#endif /* __GNUC_MINOR__ >= 3 */ + #if __GNUC_MINOR__ >= 5 /* * Mark a position in code as unreachable. This can be used to @@ -46,8 +56,7 @@ /* Mark a function definition as prohibited from being cloned. */ #define __noclone __attribute__((__noclone__)) -#endif -#endif +#endif /* __GNUC_MINOR__ >= 5 */ #if __GNUC_MINOR__ >= 6 /* @@ -56,10 +65,3 @@ #define __visible __attribute__((externally_visible)) #endif -#if __GNUC_MINOR__ > 0 -#define __compiletime_object_size(obj) __builtin_object_size(obj, 0) -#endif -#if __GNUC_MINOR__ >= 3 && !defined(__CHECKER__) -#define __compiletime_warning(message) __attribute__((warning(message))) -#define __compiletime_error(message) __attribute__((error(message))) -#endif