From d924c5cf7e5554b22f7edfcb9e98670c4c02c3f0 Mon Sep 17 00:00:00 2001 From: Stephen McDowell Date: Fri, 19 Jun 2020 04:14:39 +0200 Subject: [sfnt] Support Intel compilers. * src/sfnt/pngshim.c (premultiply_data): Intel compilers do not currently support `__builtin_shuffle'. --- ChangeLog | 7 +++++++ src/sfnt/pngshim.c | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index caaf2abd0..afe932d99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-06-19 Stephen McDowell + + [sfnt] Support Intel compilers. + + * src/sfnt/pngshim.c (premultiply_data): Intel compilers do not + currently support `__builtin_shuffle'. + 2020-06-19 Sebastian Rasmussen [base] Fix memory leak (#58611). diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c index 7388837b3..2e64e5846 100644 --- a/src/sfnt/pngshim.c +++ b/src/sfnt/pngshim.c @@ -60,7 +60,12 @@ /* predates clang; the `__BYTE_ORDER__' preprocessor symbol was */ /* introduced in gcc 4.6 and clang 3.2, respectively. */ /* `__builtin_shuffle' for gcc was introduced in gcc 4.7.0. */ -#if ( ( defined( __GNUC__ ) && \ + /* */ + /* Intel compilers do not currently support __builtin_shuffle; */ + + /* The Intel check must be first. */ +#if !defined( __INTEL_COMPILER ) && \ + ( ( defined( __GNUC__ ) && \ ( ( __GNUC__ >= 5 ) || \ ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 7 ) ) ) ) || \ ( defined( __clang__ ) && \ -- cgit v1.2.1