Re: [macppc] Unbreak emulators/frodo

Ping :)

On Thu, 8 Oct 2020 02:47:15 +0200
Charlene Wendling wrote:

> Hi,
>
> > http://build-failures.rhaalovely.net/powerpc/2020-08-23/emulators/frodo.log
>
> What's happening here is that the author used CodeWarrior styled asm
> inline functions [0]. They are guarded by "#ifdef __POWERPC_", that
> base-clang defines but not base-gcc.
>
> The below diff reverts the situation as it was when macppc was a gcc
> arch.
>
> No REVISION bump is needed because it never built with clang yet (and
> we bumped _SYSTEM_VERSION-powerpc since then).
>
> The runtime is good, by the way :)
>
> Comments/feedback are welcome,
>
> Charlène.
>
>
> [0]
> http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20130107/071508.html
>

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/frodo/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 12 Jul 2019 20:46:08 -0000 1.31
+++ Makefile 8 Oct 2020 00:35:57 -0000
@@ -46,6 +46,12 @@ post-patch:

NO_TEST= Yes

+# There are powerpc-specific CodeWarrior like asm inline functions not
+# understood by clang
+.if ${MACHINE_ARCH:Mpowerpc}
+CFLAGS += -U__POWERPC__
+.endif
+
do-install:
${INSTALL_PROGRAM} ${WRKDIST}/Frodo ${PREFIX}/bin/frodo
${INSTALL_PROGRAM} ${WRKDIST}/FrodoSC ${PREFIX}/bin/frodoSC