@@ -40,31 +40,19 @@ This file is derived from NumPy 1.7. See NUMPY_LICENSE.txt
40
40
#else
41
41
#if defined __has_builtin
42
42
#if __has_builtin (__builtin_add_overflow )
43
- #if _LP64 || __LP64__ || _ILP64 || __ILP64__
44
- #define checked_int64_add (a , b , res ) __builtin_saddl_overflow(a, b, res)
45
- #define checked_int64_sub (a , b , res ) __builtin_ssubl_overflow(a, b, res)
46
- #define checked_int64_mul (a , b , res ) __builtin_smull_overflow(a, b, res)
47
- #else
48
- #define checked_int64_add (a , b , res ) __builtin_saddll_overflow(a, b, res)
49
- #define checked_int64_sub (a , b , res ) __builtin_ssubll_overflow(a, b, res)
50
- #define checked_int64_mul (a , b , res ) __builtin_smulll_overflow(a, b, res)
51
- #endif
43
+ #define checked_int64_add (a , b , res ) __builtin_add_overflow(a, b, res)
44
+ #define checked_int64_sub (a , b , res ) __builtin_sub_overflow(a, b, res)
45
+ #define checked_int64_mul (a , b , res ) __builtin_mul_overflow(a, b, res)
52
46
#else
53
47
_Static_assert (0 ,
54
48
"Overflow checking not detected; please try a newer compiler" );
55
49
#endif
56
50
// __has_builtin was added in gcc 10, but our muslinux_1_1 build environment
57
51
// only has gcc-9.3, so fall back to __GNUC__ macro as long as we have that
58
52
#elif __GNUC__ > 7
59
- #if _LP64 || __LP64__ || _ILP64 || __ILP64__
60
- #define checked_int64_add (a , b , res ) __builtin_saddl_overflow(a, b, res)
61
- #define checked_int64_sub (a , b , res ) __builtin_ssubl_overflow(a, b, res)
62
- #define checked_int64_mul (a , b , res ) __builtin_smull_overflow(a, b, res)
63
- #else
64
- #define checked_int64_add (a , b , res ) __builtin_saddll_overflow(a, b, res)
65
- #define checked_int64_sub (a , b , res ) __builtin_ssubll_overflow(a, b, res)
66
- #define checked_int64_mul (a , b , res ) __builtin_smulll_overflow(a, b, res)
67
- #endif
53
+ #define checked_int64_add (a , b , res ) __builtin_add_overflow(a, b, res)
54
+ #define checked_int64_sub (a , b , res ) __builtin_sub_overflow(a, b, res)
55
+ #define checked_int64_mul (a , b , res ) __builtin_mul_overflow(a, b, res)
68
56
#else
69
57
_Static_assert (0 , "__has_builtin not detected; please try a newer compiler" );
70
58
#endif
0 commit comments