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

Add option to disable NORETURN

Browse Source 
Due to a bug in gcc 4.6+ it can crash when doing profile feedback
with a noreturn function pointer

(http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49299)

This adds a Makefile variable to disable noreturns.

[Patch by Junio, description by Andi Kleen]

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-06-18 18:07:03 -07:00
parent 28eb1afec9
commit 6520c84685
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -153,6 +153,9 @@ all::
# that tells runtime paths to dynamic libraries; # that tells runtime paths to dynamic libraries;
# "-Wl,-rpath=/path/lib" is used instead. # "-Wl,-rpath=/path/lib" is used instead.
# #
# Define NO_NORETURN if using buggy versions of gcc 4.6+ and profile feedback,
# as the compiler can crash (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49299)
#
# Define USE_NSEC below if you want git to care about sub-second file mtimes # Define USE_NSEC below if you want git to care about sub-second file mtimes
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and # and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely # it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
@ -1374,6 +1377,9 @@ endif
ifdef USE_ST_TIMESPEC ifdef USE_ST_TIMESPEC
BASIC_CFLAGS += -DUSE_ST_TIMESPEC BASIC_CFLAGS += -DUSE_ST_TIMESPEC
endif endif
ifdef NO_NORETURN
BASIC_CFLAGS += -DNO_NORETURN
endif
ifdef NO_NSEC ifdef NO_NSEC
BASIC_CFLAGS += -DNO_NSEC BASIC_CFLAGS += -DNO_NSEC
endif endif

2
git-compat-util.h
View File

@ -218,7 +218,7 @@ extern char *gitbasename(char *);
#if __HP_cc >= 61000 #if __HP_cc >= 61000
#define NORETURN __attribute__((noreturn)) #define NORETURN __attribute__((noreturn))
#define NORETURN_PTR #define NORETURN_PTR
#elif defined(__GNUC__) #elif defined(__GNUC__) && !defined(NO_NORETURN)
#define NORETURN __attribute__((__noreturn__)) #define NORETURN __attribute__((__noreturn__))
#define NORETURN_PTR __attribute__((__noreturn__)) #define NORETURN_PTR __attribute__((__noreturn__))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)