undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't define away __attribute__ on gcc

Browse Source 
Profile feedback sets -DNO_NORETURN, which causes the compat
header file to go into a default #else block. That #else
block defines away __attribute__(). Doing so causes all
kinds of problems with the Linux and gcc system headers:
in particular it makes the xmmintrin.h headers error out,
breaking the build.

Don't define away __attribute__ when __GNUC__ is set.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andi Kleen 2014-07-04 16:43:49 -07:00 committed by Junio C Hamano
parent 0be314c207
commit 8cd7ebc89e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-compat-util.h
View File

@ -291,10 +291,12 @@ extern char *gitbasename(char *);
#else #else
#define NORETURN #define NORETURN
#define NORETURN_PTR #define NORETURN_PTR
#ifndef __GNUC__
#ifndef __attribute__ #ifndef __attribute__
#define __attribute__(x) #define __attribute__(x)
#endif #endif
#endif #endif
#endif
/* The sentinel attribute is valid from gcc version 4.0 */ /* The sentinel attribute is valid from gcc version 4.0 */
#if defined(__GNUC__) && (__GNUC__ >= 4) #if defined(__GNUC__) && (__GNUC__ >= 4)