From b080247a21953ebdb2808defcab497d7629a77e5 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 26 Jul 2026 22:51:58 +0200 Subject: [PATCH] Revert "Mark temporaries as volatile to avoid SIGBUS in multithreaded builds with gcc15+ on 32bit FreeBSD/x86" --- Makefile.system | 4 ---- driver/level2/tpmv_thread.c | 2 +- driver/level3/syr2k_kernel.c | 2 +- kernel/generic/trmm_lncopy_4.c | 6 +++--- kernel/generic/trmm_ltcopy_4.c | 6 +++--- kernel/generic/trmm_utcopy_4.c | 6 +++--- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile.system b/Makefile.system index d5d9545668..2290e783f4 100644 --- a/Makefile.system +++ b/Makefile.system @@ -18,10 +18,6 @@ HOSTARCH := $(shell uname -m) ifeq ($(HOSTARCH), amd64) HOSTARCH=x86_64 endif -ifeq ($(HOSTARCH), i386) -HOSTARCH=x86 -override BINARY=32 -endif # Catch conflicting usage of ARCH in some BSD environments ifeq ($(ARCH), amd64) diff --git a/driver/level2/tpmv_thread.c b/driver/level2/tpmv_thread.c index 79f3b2767f..a077591a57 100644 --- a/driver/level2/tpmv_thread.c +++ b/driver/level2/tpmv_thread.c @@ -71,7 +71,7 @@ static int tpmv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *dummy1, FLOAT *buffer, BLASLONG pos){ - volatile FLOAT *a, *x, *y; + FLOAT *a, *x, *y; BLASLONG incx; BLASLONG m_from, m_to; diff --git a/driver/level3/syr2k_kernel.c b/driver/level3/syr2k_kernel.c index 19d4b988ae..f9e4a4cda0 100644 --- a/driver/level3/syr2k_kernel.c +++ b/driver/level3/syr2k_kernel.c @@ -47,7 +47,7 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG k, FLOAT alpha_r, BLASLONG i, j; BLASLONG loop; - volatile FLOAT subbuffer[GEMM_UNROLL_MN * GEMM_UNROLL_MN * COMPSIZE]; + FLOAT subbuffer[GEMM_UNROLL_MN * GEMM_UNROLL_MN * COMPSIZE]; if (m + offset < 0) { #ifndef LOWER diff --git a/kernel/generic/trmm_lncopy_4.c b/kernel/generic/trmm_lncopy_4.c index 37ed8aca61..25632d2423 100644 --- a/kernel/generic/trmm_lncopy_4.c +++ b/kernel/generic/trmm_lncopy_4.c @@ -44,9 +44,9 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON BLASLONG i, js; BLASLONG X; - volatile FLOAT data01, data02, data03, data04, data05, data06, data07, data08; - volatile FLOAT data09, data10, data11, data12, data13, data14, data15, data16; - volatile FLOAT *ao1, *ao2, *ao3, *ao4; + FLOAT data01, data02, data03, data04, data05, data06, data07, data08; + FLOAT data09, data10, data11, data12, data13, data14, data15, data16; + FLOAT *ao1, *ao2, *ao3, *ao4; js = (n >> 2); diff --git a/kernel/generic/trmm_ltcopy_4.c b/kernel/generic/trmm_ltcopy_4.c index bb7929c2f6..e90d892096 100644 --- a/kernel/generic/trmm_ltcopy_4.c +++ b/kernel/generic/trmm_ltcopy_4.c @@ -44,9 +44,9 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON BLASLONG i, js; BLASLONG X; - volatile FLOAT data01, data02, data03, data04, data05, data06, data07, data08; - volatile FLOAT data09, data10, data11, data12, data13, data14, data15, data16; - volatile FLOAT *ao1, *ao2, *ao3, *ao4; + FLOAT data01, data02, data03, data04, data05, data06, data07, data08; + FLOAT data09, data10, data11, data12, data13, data14, data15, data16; + FLOAT *ao1, *ao2, *ao3, *ao4; js = (n >> 2); diff --git a/kernel/generic/trmm_utcopy_4.c b/kernel/generic/trmm_utcopy_4.c index 05751bc154..441f7338b5 100644 --- a/kernel/generic/trmm_utcopy_4.c +++ b/kernel/generic/trmm_utcopy_4.c @@ -44,9 +44,9 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON BLASLONG i, js; BLASLONG X; - volatile FLOAT data01, data02, data03, data04, data05, data06, data07, data08; - volatile FLOAT data09, data10, data11, data12, data13, data14, data15, data16; - volatile FLOAT *ao1, *ao2, *ao3, *ao4; + FLOAT data01, data02, data03, data04, data05, data06, data07, data08; + FLOAT data09, data10, data11, data12, data13, data14, data15, data16; + FLOAT *ao1, *ao2, *ao3, *ao4; js = (n >> 2);