testing/simh: fix build with gcc 10

This commit is contained in:
Sören Tempel 2021-07-24 06:06:48 +02:00
parent a93be112d8
commit e9e06409cc
2 changed files with 30 additions and 2 deletions

View File

@ -10,7 +10,8 @@ arch="all !riscv64" # fails to build
license="BSD-3-Clause"
options="!check"
makedepends="libpcap-dev"
source="simh-$pkgver.tar.gz::https://github.com/simh/simh/archive/v$_pkgver.tar.gz"
source="simh-$pkgver.tar.gz::https://github.com/simh/simh/archive/v$_pkgver.tar.gz
gcc-10.patch"
builddir="$srcdir"/simh-$_pkgver
export CFLAGS="$CFLAGS -fcommon"
@ -32,4 +33,7 @@ package() {
cp *.bin "$pkgdir"/usr/lib/simh
}
sha512sums="7c2f81a64d3016b9a44409fc336c804c0da836317745d47594cc48c64cb57dc8f22084d9086e3f86868ec485ee56ac63301f350cee6d275e705b7c5fc82875db simh-3.11.1.tar.gz"
sha512sums="
7c2f81a64d3016b9a44409fc336c804c0da836317745d47594cc48c64cb57dc8f22084d9086e3f86868ec485ee56ac63301f350cee6d275e705b7c5fc82875db simh-3.11.1.tar.gz
9b6ac5106528e9cd403cfc0a9b0d22192bed5ed1172bb34447274c69b3c2408e47f08125fc845b82091f55e21adf67c72db531d9032f413aaad06b3f55655ca4 gcc-10.patch
"

24
testing/simh/gcc-10.patch Normal file
View File

@ -0,0 +1,24 @@
diff -upr simh-3.11-1.orig/PDP11/pdp11_defs.h simh-3.11-1/PDP11/pdp11_defs.h
--- simh-3.11-1.orig/PDP11/pdp11_defs.h 2021-07-24 09:40:30.894068560 +0200
+++ simh-3.11-1/PDP11/pdp11_defs.h 2021-07-24 09:41:15.954102912 +0200
@@ -900,13 +900,13 @@ void cpu_set_boot (int32 pc);
#define WrMemW(pa,d) uc15_WrMemW (pa, d)
#define WrMemB(pa, d) uc15_WrMemB (pa, d)
-uint32 uc15_memsize;
-int32 uc15_RdMemW (int32 pa);
-int32 uc15_RdMemB (int32 pa);
-void uc15_WrMemW (int32 pa, int32 d);
-void uc15_WrMemB (int32 pa, int32 d);
-int32 Map_Read18 (uint32 ba, int32 bc, uint32 *buf);
-int32 Map_Write18 (uint32 ba, int32 bc, uint32 *buf);
+extern uint32 uc15_memsize;
+extern int32 uc15_RdMemW (int32 pa);
+extern int32 uc15_RdMemB (int32 pa);
+extern void uc15_WrMemW (int32 pa, int32 d);
+extern void uc15_WrMemB (int32 pa, int32 d);
+extern int32 Map_Read18 (uint32 ba, int32 bc, uint32 *buf);
+extern int32 Map_Write18 (uint32 ba, int32 bc, uint32 *buf);
#else /* PDP-11 */