Skip to content

Fix LAPACK for f2c converted sources #4453

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

Closed
wants to merge 2 commits into from
Closed

Fix LAPACK for f2c converted sources #4453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da82ee4
Fix LAPACK for f2c converted sources
AndreySokolovSC May 5, 2023
7e2c6eb
Fix INTERFACE64 builds on riscv and loongarch
martin-frbg Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 20 additions & 1 deletion Makefile.system
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,13 +827,32 @@ endif
ifeq ($(ARCH), riscv64)
NO_BINARY_MODE = 1
BINARY_DEFINED = 1
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0)
ifeq ($(F_COMPILER), GFORTRAN)
FCOMMON_OPT += -fdefault-integer-8
endif
ifeq ($(F_COMPILER), FLANG)
FCOMMON_OPT += -i8
endif
endif
endif
endif

ifeq ($(ARCH), loongarch64)
NO_BINARY_MODE = 1
BINARY_DEFINED = 1
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0)
ifeq ($(F_COMPILER), GFORTRAN)
FCOMMON_OPT += -fdefault-integer-8
endif
ifeq ($(F_COMPILER), FLANG)
FCOMMON_OPT += -i8
endif
endif
endif
endif


#
# C Compiler dependent settings
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/dlamch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/droundup_lwork.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/dsecnd_INT_ETIME.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/dsecnd_NONE.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/ilaver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/lsame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/lsametst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/second_INT_ETIME.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/second_NONE.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/secondtst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/slamch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/INSTALL/sroundup_lwork.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static inline _Complex float * _pCf(complex *z) {return (_Complex float*)z;}
static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*)z;}
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
6 changes: 3 additions & 3 deletions lapack-netlib/SRC/DEPRECATED/cgegs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down Expand Up @@ -779,7 +779,7 @@ rices</b> */
*, integer *, complex *, integer *), claset_(char *,
integer *, integer *, complex *, complex *, complex *, integer *);
real safmin;
extern /* Subroutine */ int xerbla_(char *, integer *);
extern /* Subroutine */ int xerbla_(char *, integer *, ftnlen);
extern integer ilaenv_(integer *, char *, char *, integer *, integer *,
integer *, integer *, ftnlen, ftnlen);
real bignum;
Expand Down Expand Up @@ -898,7 +898,7 @@ rices</b> */

if (*info != 0) {
i__1 = -(*info);
xerbla_("CGEGS ", &i__1);
xerbla_("CGEGS", &i__1, (ftnlen)5);
return 0;
} else if (lquery) {
return 0;
Expand Down
6 changes: 3 additions & 3 deletions lapack-netlib/SRC/DEPRECATED/cgegv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down Expand Up @@ -852,7 +852,7 @@ rices</b> */
integer *, integer *, complex *, integer *, complex *, integer *,
complex *, complex *, complex *, integer *, complex *, integer *,
complex *, integer *, real *, integer *),
xerbla_(char *, integer *);
xerbla_(char *, integer *, ftnlen);
extern integer ilaenv_(integer *, char *, char *, integer *, integer *,
integer *, integer *, ftnlen, ftnlen);
integer ijobvl, iright;
Expand Down Expand Up @@ -969,7 +969,7 @@ rices</b> */

if (*info != 0) {
i__1 = -(*info);
xerbla_("CGEGV ", &i__1);
xerbla_("CGEGV", &i__1, (ftnlen)5);
return 0;
} else if (lquery) {
return 0;
Expand Down
6 changes: 3 additions & 3 deletions lapack-netlib/SRC/DEPRECATED/cgelsx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down Expand Up @@ -730,7 +730,7 @@ f"> */
extern real slamch_(char *);
extern /* Subroutine */ int claset_(char *, integer *, integer *, complex
*, complex *, complex *, integer *), xerbla_(char *,
integer *);
integer *, ftnlen);
real bignum;
extern /* Subroutine */ int clatzm_(char *, integer *, integer *, complex
*, integer *, complex *, complex *, complex *, integer *, complex
Expand Down Expand Up @@ -787,7 +787,7 @@ f"> */

if (*info != 0) {
i__1 = -(*info);
xerbla_("CGELSX", &i__1);
xerbla_("CGELSX", &i__1, (ftnlen)6);
return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions lapack-netlib/SRC/DEPRECATED/cgeqpf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down Expand Up @@ -688,7 +688,7 @@ f"> */
extern /* Subroutine */ int clarfg_(integer *, complex *, complex *,
integer *, complex *);
extern real slamch_(char *);
extern /* Subroutine */ int xerbla_(char *, integer *);
extern /* Subroutine */ int xerbla_(char *, integer *, ftnlen);
extern integer isamax_(integer *, real *, integer *);
complex aii;
integer pvt;
Expand Down Expand Up @@ -725,7 +725,7 @@ f"> */
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CGEQPF", &i__1);
xerbla_("CGEQPF", &i__1, (ftnlen)6);
return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions lapack-netlib/SRC/DEPRECATED/cggsvd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down Expand Up @@ -878,7 +878,7 @@ f"> */
complex *, integer *, real *, real *, real *, real *, complex *,
integer *, complex *, integer *, complex *, integer *, complex *,
integer *, integer *), xerbla_(char *,
integer *), cggsvp_(char *, char *, char *, integer *,
integer *, ftnlen), cggsvp_(char *, char *, char *, integer *,
integer *, integer *, complex *, integer *, complex *, integer *,
real *, real *, integer *, integer *, complex *, integer *,
complex *, integer *, complex *, integer *, integer *, real *,
Expand Down Expand Up @@ -950,7 +950,7 @@ f"> */
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CGGSVD", &i__1);
xerbla_("CGGSVD", &i__1, (ftnlen)6);
return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions lapack-netlib/SRC/DEPRECATED/cggsvp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down Expand Up @@ -803,7 +803,7 @@ f"> */
*, integer *, integer *, complex *, integer *, complex *, integer
*), claset_(char *, integer *, integer *, complex *,
complex *, complex *, integer *), xerbla_(char *, integer
*), clapmt_(logical *, integer *, integer *, complex *,
*, ftnlen), clapmt_(logical *, integer *, integer *, complex *,
integer *, integer *);
logical forwrd;

Expand Down Expand Up @@ -872,7 +872,7 @@ f"> */
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CGGSVP", &i__1);
xerbla_("CGGSVP", &i__1, (ftnlen)6);
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/SRC/DEPRECATED/clahrd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
2 changes: 1 addition & 1 deletion lapack-netlib/SRC/DEPRECATED/clatzm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down
6 changes: 3 additions & 3 deletions lapack-netlib/SRC/DEPRECATED/ctzrqf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down Expand Up @@ -672,7 +672,7 @@ f"> */
integer m1;
extern /* Subroutine */ int clarfg_(integer *, complex *, complex *,
integer *, complex *), clacgv_(integer *, complex *, integer *),
xerbla_(char *, integer *);
xerbla_(char *, integer *, ftnlen);


/* -- LAPACK computational routine (version 3.7.0) -- */
Expand Down Expand Up @@ -703,7 +703,7 @@ f"> */
}
if (*info != 0) {
i__1 = -(*info);
xerbla_("CTZRQF", &i__1);
xerbla_("CTZRQF", &i__1, (ftnlen)6);
return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions lapack-netlib/SRC/DEPRECATED/dgegs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static inline _Complex double * _pCd(doublecomplex *z) {return (_Complex double*
#endif
#define pCf(z) (*_pCf(z))
#define pCd(z) (*_pCd(z))
typedef int logical;
typedef integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
Expand Down Expand Up @@ -783,7 +783,7 @@ rices</b> */
doublereal safmin;
extern /* Subroutine */ int dlaset_(char *, integer *, integer *,
doublereal *, doublereal *, doublereal *, integer *),
xerbla_(char *, integer *);
xerbla_(char *, integer *, ftnlen);
extern integer ilaenv_(integer *, char *, char *, integer *, integer *,
integer *, integer *, ftnlen, ftnlen);
doublereal bignum;
Expand Down Expand Up @@ -904,7 +904,7 @@ rices</b> */

if (*info != 0) {
i__1 = -(*info);
xerbla_("DGEGS ", &i__1);
xerbla_("DGEGS", &i__1, (ftnlen)5);
return 0;
} else if (lquery) {
return 0;
Expand Down
Loading