summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-10-28 21:39:31 +0000
committerNeal Norwitz <nnorwitz@gmail.com>2006-10-28 21:39:31 +0000
commitca63121553ac1ce98d7c2608e99fc813651524d3 (patch)
treed69f8ef2ed40ea7f6b0e45163c6175aa9eda1868
parente0cf624747a35a6db2f632607e7788b8e66d0954 (diff)
downloadcpython-git-ca63121553ac1ce98d7c2608e99fc813651524d3.tar.gz
Backport 52506:
Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either.
-rw-r--r--Objects/obmalloc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 0ca8f2bcaf..840570e06c 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -691,7 +691,8 @@ extremely desirable that it be this fast.
#undef Py_ADDRESS_IN_RANGE
-#if defined(__GNUC__) && (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)
+#if defined(__GNUC__) && ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) || \
+ (__GNUC__ >= 4))
#define Py_NO_INLINE __attribute__((__noinline__))
#else
#define Py_NO_INLINE