CVS commit: pkgsrc/emulators

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Dec 22 13:31:54 UTC 2024

Modified Files:
        pkgsrc/emulators/picodrive: Makefile.common
        pkgsrc/emulators/retroarch: Makefile

Log Message:
Work around netbsd-10 arm eabi toolchain issues...


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/picodrive/Makefile.common
cvs rdiff -u -r1.74 -r1.75 pkgsrc/emulators/retroarch/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/picodrive/Makefile.common
diff -u pkgsrc/emulators/picodrive/Makefile.common:1.1 pkgsrc/emulators/picodrive/Makefile.common:1.2
--- pkgsrc/emulators/picodrive/Makefile.common:1.1      Fri Apr 26 09:04:31 2024
+++ pkgsrc/emulators/picodrive/Makefile.common  Sun Dec 22 13:31:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2024/04/26 09:04:31 nia Exp $
+# $NetBSD: Makefile.common,v 1.2 2024/12/22 13:31:54 nia Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,7 +6,7 @@ NOT_FOR_PLATFORM=       ${BIGENDIANPLATFORMS}
 
 .if ${MACHINE_ARCH} == "earmv7hf"
 # Avoid mixing in Thumb code with Picodrive's ARM asm.
-CFLAGS+=       -marm
+CFLAGS+=       -marm -mfpu=vfp -march=armv6 -fno-use-linker-plugin
 MAKE_FLAGS+=   ARCH=arm
 MAKE_FLAGS+=   ARM_ASM=1
 MAKE_FLAGS+=   use_cyclone=0
@@ -16,7 +16,7 @@ MAKE_FLAGS+=  use_cz80=1
 MAKE_FLAGS+=   use_sh2drc=1
 MAKE_FLAGS+=   use_svpdrc=1
 .elif ${MACHINE_ARCH} == "earmv6hf"
-CFLAGS+=       -marm
+CFLAGS+=       -marm -mfpu=neon -march=armv7-a -fno-use-linker-plugin
 MAKE_FLAGS+=   ARCH=arm
 MAKE_FLAGS+=   ARM_ASM=1
 MAKE_FLAGS+=   asm_memory=1

Index: pkgsrc/emulators/retroarch/Makefile
diff -u pkgsrc/emulators/retroarch/Makefile:1.74 pkgsrc/emulators/retroarch/Makefile:1.75
--- pkgsrc/emulators/retroarch/Makefile:1.74    Thu Nov 14 22:19:43 2024
+++ pkgsrc/emulators/retroarch/Makefile Sun Dec 22 13:31:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2024/11/14 22:19:43 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2024/12/22 13:31:54 nia Exp $
 
 PKGREVISION= 29
 .include "version.mk"
@@ -60,12 +60,16 @@ CONFIGURE_ARGS+=    --enable-dylib
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "earmv6hf"
-CFLAGS+=               -march=armv6 -marm
+CFLAGS+=               -mfpu=vfp -march=armv6 -marm
+# workaround for netbsd-10 toolchain issues
+CFLAGS+=               -fno-use-linker-plugin
 CONFIGURE_ARGS+=       --enable-floathard
 .endif
 
 .if ${MACHINE_ARCH} == "earmv7hf"
-CFLAGS+=               -march=armv7-a -marm
+CFLAGS+=               -mfpu=neon -march=armv7-a -marm
+# workaround for netbsd-10 toolchain issues
+CFLAGS+=               -fno-use-linker-plugin
 CONFIGURE_ARGS+=       --enable-floathard
 .endif