summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorRolland Dudemaine <rolland@ghs.com>2015-10-27 01:59:48 +0100
committerRolland Dudemaine <rolland@ghs.com>2016-03-17 07:58:25 +0000
commitb5af1bd8cff1643239809633d6be4513dd21a057 (patch)
treedc1cb1bca1d7114f00613da1b2f1d32a4d955a75 /src/3rdparty
parent44724563aaa644578fad56651a76eecd311ee11e (diff)
Make pcre sljit build with GHS toolchain.
This commit should also be pushed to pcre main repo, but is necessary to build Qt. Change-Id: I647e784feca09c13260f938823c2bcf5adec2a00 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/pcre/sljit/sljitNativeX86_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/pcre/sljit/sljitNativeX86_common.c b/src/3rdparty/pcre/sljit/sljitNativeX86_common.c
index 416c15afaf..f03393a2d3 100644
--- a/src/3rdparty/pcre/sljit/sljitNativeX86_common.c
+++ b/src/3rdparty/pcre/sljit/sljitNativeX86_common.c
@@ -289,7 +289,7 @@ static void get_cpu_features(void)
__cpuid(CPUInfo, 1);
features = (sljit_ui)CPUInfo[3];
-#elif defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C)
+#elif defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__ghs)
/* AT&T syntax. */
__asm__ (