Skip to content

Commit

Permalink
patches to apply to gdbm and m4 when using oneapi compiler (spack#21740)
Browse files Browse the repository at this point in the history
  • Loading branch information
lee218llnl committed Feb 18, 2021
1 parent 8e3ac85 commit 3364e55
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/gdbm/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage):
patch('gdbm.patch', when='%clang@11:')
patch('gdbm.patch', when='%cce@11:')
patch('gdbm.patch', when='%aocc@2:')
patch('gdbm.patch', when='%oneapi')

def configure_args(self):

Expand Down
18 changes: 18 additions & 0 deletions var/spack/repos/builtin/packages/m4/oneapi.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--- a/lib/xalloc-oversized.h 2020-08-07 11:04:56.154698639 -0700
+++ b/lib/xalloc-oversized.h 2020-08-07 11:06:11.667997389 -0700
@@ -46,13 +46,13 @@
positive and N must be nonnegative. This is a macro, not a
function, so that it works correctly even when SIZE_MAX < N. */

-#if 7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)
+#if ((7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) && !defined __INTEL_LLVM_COMPILER)
# define xalloc_oversized(n, s) \
__builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
#elif ((5 <= __GNUC__ \
|| (__has_builtin (__builtin_mul_overflow) \
&& __has_builtin (__builtin_constant_p))) \
- && !__STRICT_ANSI__)
+ && !__STRICT_ANSI__ && !defined __INTEL_LLVM_COMPILER)
# define xalloc_oversized(n, s) \
(__builtin_constant_p (n) && __builtin_constant_p (s) \
? __xalloc_oversized (n, s) \
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/m4/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class M4(AutotoolsPackage, GNUMirrorPackage):
patch('gnulib-pgi.patch', when='@1.4.18')
patch('pgi.patch', when='@1.4.17')
patch('nvhpc.patch', when='%nvhpc')
patch('oneapi.patch', when='%oneapi')
# from: https://github.com/Homebrew/homebrew-core/blob/master/Formula/m4.rb
# Patch credit to Jeremy Huddleston Sequoia <jeremyhu@apple.com>
patch('secure_snprintf.patch', when='os = highsierra')
Expand Down

0 comments on commit 3364e55

Please sign in to comment.