Clang 6 fix for emulators/BasiliskII

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Clang 6 fix for emulators/BasiliskII

Frederic Cambus
Hi ports@,

Here is a diff to fix BasiliskII build with Clang 6 (from upstream).

Comments? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/BasiliskII/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 21 Nov 2017 00:13:00 -0000 1.38
+++ Makefile 16 Apr 2018 13:02:33 -0000
@@ -4,7 +4,7 @@ COMMENT= open source 68k Macintosh emul
 
 DISTNAME= BasiliskII_src_01052006
 PKGNAME= BasiliskII-1.0
-REVISION= 8
+REVISION= 9
 CATEGORIES= emulators
 
 HOMEPAGE= http://basilisk.cebix.net/
Index: patches/patch-src_Unix_clip_unix_cpp
===================================================================
RCS file: patches/patch-src_Unix_clip_unix_cpp
diff -N patches/patch-src_Unix_clip_unix_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Unix_clip_unix_cpp 16 Apr 2018 13:02:33 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix for Clang 6.
+Upstream commit 71852dae82445b5a43803e42897ccd0989d135ab.
+
+Index: src/Unix/clip_unix.cpp
+--- src/Unix/clip_unix.cpp.orig
++++ src/Unix/clip_unix.cpp
+@@ -496,7 +496,7 @@ static void do_getscrap(void **handle, uint32 type, in
+ 0x2f, 0x3c, 0, 0, 0, 0, // move.l #outbuf,-(sp)
+ 0xa9, 0xfe, // PutScrap()
+ 0x58, 0x8f, // addq.l #4,sp
+- M68K_RTS >> 8, M68K_RTS
++ M68K_RTS >> 8, M68K_RTS & 0xff
+ };
+ r.d[0] = sizeof(proc);
+ Execute68kTrap(0xa71e, &r); // NewPtrSysClear()

Reply | Threaded
Open this post in threaded view
|

Re: Clang 6 fix for emulators/BasiliskII

Ingo Schwarze
Hi Frederic,

Frederic Cambus wrote on Mon, Apr 16, 2018 at 03:05:23PM +0200:

> Here is a diff to fix BasiliskII build with Clang 6 (from upstream).

Uh oh.  The upstream fix was committed on Feb 21, 2010.

That said, your patch does agree with upstream, looks reasonable,
and builds for me.

OK schwarze@
  Ingo


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/BasiliskII/Makefile,v
> retrieving revision 1.38
> diff -u -p -r1.38 Makefile
> --- Makefile 21 Nov 2017 00:13:00 -0000 1.38
> +++ Makefile 16 Apr 2018 13:02:33 -0000
> @@ -4,7 +4,7 @@ COMMENT= open source 68k Macintosh emul
>  
>  DISTNAME= BasiliskII_src_01052006
>  PKGNAME= BasiliskII-1.0
> -REVISION= 8
> +REVISION= 9
>  CATEGORIES= emulators
>  
>  HOMEPAGE= http://basilisk.cebix.net/
> Index: patches/patch-src_Unix_clip_unix_cpp
> ===================================================================
> RCS file: patches/patch-src_Unix_clip_unix_cpp
> diff -N patches/patch-src_Unix_clip_unix_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_Unix_clip_unix_cpp 16 Apr 2018 13:02:33 -0000
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Fix for Clang 6.
> +Upstream commit 71852dae82445b5a43803e42897ccd0989d135ab.
> +
> +Index: src/Unix/clip_unix.cpp
> +--- src/Unix/clip_unix.cpp.orig
> ++++ src/Unix/clip_unix.cpp
> +@@ -496,7 +496,7 @@ static void do_getscrap(void **handle, uint32 type, in
> + 0x2f, 0x3c, 0, 0, 0, 0, // move.l #outbuf,-(sp)
> + 0xa9, 0xfe, // PutScrap()
> + 0x58, 0x8f, // addq.l #4,sp
> +- M68K_RTS >> 8, M68K_RTS
> ++ M68K_RTS >> 8, M68K_RTS & 0xff
> + };
> + r.d[0] = sizeof(proc);
> + Execute68kTrap(0xa71e, &r); // NewPtrSysClear()
>