luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with gcc10 wrt multiple definitions issue 

gcc10 now defaults to -fno-common (ref: https://gcc.gnu.org/gcc-10/changes.html ). Now with compiled with gcc10, multiple definitions are found which causes linker error as:

*  --with-tcl:
```
/usr/bin/ld: table/table3D/cfunc.o:/builddir/build/BUILD/ngspice-32/ngspice/tclspice/src/xspice/icm/../../../src/include/../xspice/icm/dlmain.h:8: multiple definition of `coreitf'; table/dlmain.o:/builddir/build/BUILD/ngspice-32/ngspice/tclspice/src/xspice/icm/dlmain.c:45: first defined here
```

*  --enable-oldapps
```
/bin/ld: frontend/com_history.o:(.data+0x4): multiple definition of `cp_maxhistlength'; ngsconvert.o:(.bss+0xa4): first defined here
collect2: error: ld returned 1 exit status
```

This commit fixes these issues.
This commit is contained in:
Mamoru TASAKA 2020-05-06 01:15:53 +09:00
parent bbe81ca8f8
commit fe207966d7
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ngsconvert.c
View File

@ -24,7 +24,6 @@ FILE *cp_err = NULL;
FILE *cp_curin = NULL; FILE *cp_curin = NULL;
FILE *cp_curout = NULL; FILE *cp_curout = NULL;
FILE *cp_curerr = NULL; FILE *cp_curerr = NULL;
int cp_maxhistlength;
bool cp_debug = FALSE; bool cp_debug = FALSE;
char cp_chars[128]; char cp_chars[128];
bool cp_nocc = TRUE; bool cp_nocc = TRUE;

2
src/xspice/icm/dlmain.h
View File

@ -5,6 +5,6 @@
#include "ngspice/mifproto.h" #include "ngspice/mifproto.h"
#include "ngspice/dllitf.h" #include "ngspice/dllitf.h"
struct coreInfo_t *coreitf; extern struct coreInfo_t *coreitf;
#endif /* dlmain.h */ #endif /* dlmain.h */