Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix problems found attempting to build on i686 #1500

Merged
merged 3 commits into from
Aug 17, 2022
Merged

Fix problems found attempting to build on i686 #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fd3e8c
Improve SIMD detection
daviesrob Aug 16, 2022
c975d6e
Silence some overflow warnings on i686
daviesrob Aug 16, 2022
bb54fcf
Silence a gcc-10 format-truncation warning.
daviesrob Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ AX_CHECK_COMPILE_FLAG([-mavx2], [
]],[[
__m256i a = _mm256_set_epi32(1, 2, 3, 4, 5, 6, 7, 8);
__m256i b = _mm256_add_epi32(a, a);
return *((char *) &b);
long long c = _mm256_extract_epi64(b, 0);
return (int) c;
]])])

dnl Options for rANS32x16 avx512 version
Expand Down
2 changes: 2 additions & 0 deletions hts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,6 +1354,8 @@ static int hts_crypt4gh_redirect(const char *fn, const char *mode,
int ret = -1;

if (fn2_len > sizeof(fn_buf)) {
if (fn2_len >= INT_MAX) // Silence gcc format-truncation warning
return -1;
fn2 = malloc(fn2_len);
if (!fn2) return -1;
}
Expand Down
3 changes: 2 additions & 1 deletion hts_probe_cc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ cat - <<'EOF' > conftest.c
int main(int argc, char **argv) {
__m256i a = _mm256_set_epi32(1, 2, 3, 4, 5, 6, 7, 8);
__m256i b = _mm256_add_epi32(a, a);
return *((char *) &b);
long long c = _mm256_extract_epi64(b, 0);
return (int) c;
}
EOF
FLAGS="-mavx2"
Expand Down
2 changes: 1 addition & 1 deletion m4/ax_check_compile_flag.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
[AS_VAR_SET(CACHEVAR,[yes])],
[AS_VAR_SET(CACHEVAR,[no])])
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
Expand Down
6 changes: 4 additions & 2 deletions test/test_time_funcs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ int main(int argc, char **argv) {
if (test_normalised(0, INT_MAX - 1000, 1000) != 0)
return EXIT_FAILURE;
if (sizeof(time_t) >= 8) {
if (test_normalised(INT_MAX - 1000, (time_t) INT_MAX * 2, 1000) != 0)
if (test_normalised(INT_MAX - 1000,
(time_t)((int64_t) INT_MAX * 2), 1000) != 0)
return EXIT_FAILURE;
}

Expand Down Expand Up @@ -116,7 +117,8 @@ int main(int argc, char **argv) {
res |= test_specific(2038, 1, 19, 3, 14, 8, (time_t) -1);
} else {
// 2038-01-19 03:14:08
res |= test_specific(2038, 1, 19, 3, 14, 8, (time_t) INT_MAX + 1);
res |= test_specific(2038, 1, 19, 3, 14, 8,
(time_t)((int64_t) INT_MAX + 1));
}

return res == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
Expand Down