Skip to content

Commit 7a4c36e

Browse files
authored
Fix compilation and linking with the desired variant of xerbla on Windows/LLVM
1 parent 18014b0 commit 7a4c36e

File tree

9 files changed

+36
-0
lines changed

9 files changed

+36
-0
lines changed

ctest/c_c2chke.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ void F77_c2chke(char *rout) {
3333
BETA[2] = {0.0,0.0},
3434
RALPHA = 0.0;
3535
extern int cblas_info, cblas_lerr, cblas_ok;
36+
#ifdef OS_WINDOWS
37+
int RowMajorStrg = TRUE;
38+
#else
3639
extern int RowMajorStrg;
40+
#endif
3741
extern char *cblas_rout;
3842

3943
if (link_xerbla) /* call these first to link */

ctest/c_c3chke.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ void F77_c3chke(char * rout) {
3333
BETA[2] = {0.0,0.0},
3434
RALPHA = 0.0, RBETA = 0.0;
3535
extern int cblas_info, cblas_lerr, cblas_ok;
36+
#ifdef OS_WINDOWS
37+
int RowMajorStrg = TRUE;
38+
#else
3639
extern int RowMajorStrg;
40+
#endif
3741
extern char *cblas_rout;
3842

3943
cblas_ok = TRUE ;

ctest/c_d2chke.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ void F77_d2chke(char *rout) {
3131
Y[2] = {0.0,0.0},
3232
ALPHA=0.0, BETA=0.0;
3333
extern int cblas_info, cblas_lerr, cblas_ok;
34+
#ifdef OS_WINDOWS
35+
int RowMajorStrg = TRUE;
36+
#else
3437
extern int RowMajorStrg;
38+
#endif
3539
extern char *cblas_rout;
3640

3741
if (link_xerbla) /* call these first to link */

ctest/c_d3chke.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ void F77_d3chke(char *rout) {
3131
C[2] = {0.0,0.0},
3232
ALPHA=0.0, BETA=0.0;
3333
extern int cblas_info, cblas_lerr, cblas_ok;
34+
#ifdef OS_WINDOWS
35+
int RowMajorStrg = TRUE;
36+
#else
3437
extern int RowMajorStrg;
38+
#endif
3539
extern char *cblas_rout;
3640

3741
if (link_xerbla) /* call these first to link */

ctest/c_s2chke.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ void F77_s2chke(char *rout) {
3131
Y[2] = {0.0,0.0},
3232
ALPHA=0.0, BETA=0.0;
3333
extern int cblas_info, cblas_lerr, cblas_ok;
34+
#ifdef OS_WINDOWS
35+
int RowMajorStrg = TRUE;
36+
#else
3437
extern int RowMajorStrg;
38+
#endif
3539
extern char *cblas_rout;
3640

3741
if (link_xerbla) /* call these first to link */

ctest/c_s3chke.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ void F77_s3chke(char *rout) {
3131
C[2] = {0.0,0.0},
3232
ALPHA=0.0, BETA=0.0;
3333
extern int cblas_info, cblas_lerr, cblas_ok;
34+
#ifdef OS_WINDOWS
35+
int RowMajorStrg = TRUE;
36+
#else
3437
extern int RowMajorStrg;
38+
#endif
3539
extern char *cblas_rout;
3640

3741
if (link_xerbla) /* call these first to link */

ctest/c_xerbla.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ void cblas_xerbla(blasint info, char *rout, char *form, ...)
99
{
1010
extern int cblas_lerr, cblas_info, cblas_ok;
1111
extern int link_xerbla;
12+
#ifdef OS_WINDOWS
13+
extern __declspec(selectany) int RowMajorStrg;
14+
#else
1215
extern int RowMajorStrg;
16+
#endif
1317
extern char *cblas_rout;
1418

1519
/* Initially, c__3chke will call this routine with

ctest/c_z2chke.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ void F77_z2chke(char *rout) {
3333
BETA[2] = {0.0,0.0},
3434
RALPHA = 0.0;
3535
extern int cblas_info, cblas_lerr, cblas_ok;
36+
#ifdef OS_WINDOWS
37+
int RowMajorStrg = TRUE;
38+
#else
3639
extern int RowMajorStrg;
40+
#endif
3741
extern char *cblas_rout;
3842

3943
if (link_xerbla) /* call these first to link */

ctest/c_z3chke.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ void F77_z3chke(char * rout) {
3333
BETA[2] = {0.0,0.0},
3434
RALPHA = 0.0, RBETA = 0.0;
3535
extern int cblas_info, cblas_lerr, cblas_ok;
36+
#ifdef OS_WINDOWS
37+
int RowMajorStrg = TRUE;
38+
#else
3639
extern int RowMajorStrg;
40+
#endif
3741
extern char *cblas_rout;
3842

3943
cblas_ok = TRUE ;

0 commit comments

Comments
 (0)