From 4f238daf4122e45262488f97cdd20e4da286b730 Mon Sep 17 00:00:00 2001 From: "Philip.Hazel" Date: Fri, 17 Jun 2016 11:45:16 +0000 Subject: [PATCH] Exclude __INTEL_COMPILER in the test for __GNUC__. --- ChangeLog | 4 ++++ src/pcre2_match.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a3adc4..819e7ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -143,6 +143,10 @@ show the texts for given error numbers (i.e. to call pcre2_get_error_message() and display what it returns) and a few representative error codes are now checked in RunTest. +37. Added "&& !defined(__INTEL_COMPILER)" to the test for __GNUC__ in +pcre2_match.c, in anticipation that this is needed for the same reason it was +recently added to pcrecpp.cc in PCRE1. + Version 10.21 12-January-2016 ----------------------------- diff --git a/src/pcre2_match.c b/src/pcre2_match.c index 8ac77ca..0763a23 100644 --- a/src/pcre2_match.c +++ b/src/pcre2_match.c @@ -465,7 +465,7 @@ Returns: a match() return code */ static int -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) __attribute__ ((noinline)) #endif op_recurse_ovecsave(REGISTER PCRE2_SPTR eptr, PCRE2_SPTR callpat,