diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-09-09 00:10:20 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-09-09 00:34:21 -0400 |
| commit | 7eb2a68f2854ff1b53f84346b4c19450fba21e9f (patch) | |
| tree | 18cbe240df931a326c6b2f388cf0c3913026be44 /sim | |
| parent | f2a13264fbcf991d553488750280413a818545ed (diff) | |
| download | gdb-7eb2a68f2854ff1b53f84346b4c19450fba21e9f.zip gdb-7eb2a68f2854ff1b53f84346b4c19450fba21e9f.tar.gz gdb-7eb2a68f2854ff1b53f84346b4c19450fba21e9f.tar.bz2 | |
sim: mips: delete unused PSIZE define
It's unclear what this define is for as it appears to be unused, and
has never been used in the history of the mips sim. Delete it to tidy
up, and to fix build errors for Windows targets that have a standard
"PSIZE" struct in their system headers. This doesn't show up yet as
most sim files don't include many system headers, but enabling sockser
code for mingw uncovers the conflict.
Unfortunately the error produced by gcc is inscrutable, but running
it through the preprocessor manually manages to provide a pointer to
the underlying issue.
$ i686-w64-mingw32-gcc ... -c -o dv-sockser.o ../../../../sim/mips/../common/dv-sockser.c
<command-line>: error: expected identifier or '(' before numeric constant
In file included from /usr/i686-w64-mingw32/usr/include/windows.h:71,
from /usr/i686-w64-mingw32/usr/include/winsock2.h:23,
from ../../gnulib/import/sys/socket.h:684,
from ../../gnulib/import/netinet/in.h:43,
from ../../../../sim/mips/../common/dv-sockser.c:39:
/usr/i686-w64-mingw32/usr/include/wingdi.h:2934:59: error: unknown type name 'LPSIZE'; did you mean 'LPSIZEL'?
2934 | WINGDIAPI WINBOOL WINAPI GetAspectRatioFilterEx(HDC hdc,LPSIZE lpsize);
| ^~~~~~
| LPSIZEL
...
$ i686-w64-mingw32-gcc ... -E -dD -o dv-sockser.i ../../../../sim/mips/../common/dv-sockser.c
$ i686-w64-mingw32-gcc -c dv-sockser.i
In file included from /usr/i686-w64-mingw32/usr/include/windows.h:69,
from /usr/i686-w64-mingw32/usr/include/winsock2.h:23,
from ../../gnulib/import/sys/socket.h:684,
from ../../gnulib/import/netinet/in.h:43,
from ../../../../sim/mips/../common/dv-sockser.c:39:
/usr/i686-w64-mingw32/usr/include/windef.h:104:9: error: expected identifier or '(' before numeric constant
104 | } SIZE,*PSIZE,*LPSIZE;
| ^~
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/mips/sim-main.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h index 9905739..b87e5ce 100644 --- a/sim/mips/sim-main.h +++ b/sim/mips/sim-main.h @@ -915,8 +915,6 @@ unsigned64 mdmx_shuffle (SIM_STATE, int, unsigned64, unsigned64); #define LOADDRMASK (WITH_TARGET_WORD_BITSIZE == 64 \ ? AccessLength_DOUBLEWORD /*7*/ \ : AccessLength_WORD /*3*/) -#define PSIZE (WITH_TARGET_ADDRESS_BITSIZE) - INLINE_SIM_MAIN (void) load_memory (SIM_DESC sd, sim_cpu *cpu, address_word cia, uword64* memvalp, uword64* memval1p, int CCA, unsigned int AccessLength, address_word pAddr, address_word vAddr, int IorD); #define LoadMemory(memvalp,memval1p,AccessLength,pAddr,vAddr,IorD,raw) \ |