CVS commit: pkgsrc/mk

["Nathanial Sloss" <nat%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nat
Date:           Wed Oct 22 08:37:19 UTC 2025

Modified Files:
        pkgsrc/mk: bsd.prefs.mk
        pkgsrc/mk/gnu-config: config.guess config.sub

Log Message:
Build additions for m68ksf (m68k softfloat).

As posted to tech-pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.461 -r1.462 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mk/gnu-config/config.guess
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/gnu-config/config.sub

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

Modified files:

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.461 pkgsrc/mk/bsd.prefs.mk:1.462
--- pkgsrc/mk/bsd.prefs.mk:1.461        Tue May  6 10:08:37 2025
+++ pkgsrc/mk/bsd.prefs.mk      Wed Oct 22 08:37:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.461 2025/05/06 10:08:37 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.462 2025/10/22 08:37:18 nat Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -149,6 +149,7 @@ GNU_ARCH.i386?=             i486
 GNU_ARCH.i586?=                i486
 GNU_ARCH.i686?=                i486
 GNU_ARCH.m68000?=      m68010
+GNU_ARCH.m68ksf?=      m68k
 GNU_ARCH.mips?=                mipsel
 GNU_ARCH.sh3eb?=       sh
 GNU_ARCH.sh3el?=       shle
@@ -649,6 +650,7 @@ TARGET_OBJECT_FMT?= ${OBJECT_FMT} # XXX
     ${NATIVE_MACHINE_GNU_ARCH} == "arm" || \
     ${NATIVE_MACHINE_ARCH} == "i386" || \
     ${NATIVE_MACHINE_ARCH} == "m68k" || \
+    ${NATIVE_MACHINE_ARCH} == "m68ksf" || \
     ${NATIVE_MACHINE_ARCH} == "m68000" || \
     ${NATIVE_MACHINE_GNU_ARCH} == "sh" || \
     ${NATIVE_MACHINE_GNU_ARCH} == "shle" || \
@@ -661,6 +663,7 @@ NATIVE_APPEND_ELF=  elf
     ${MACHINE_GNU_ARCH} == "arm" || \
     ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "m68k" || \
+    ${MACHINE_ARCH} == "m68ksf" || \
     ${MACHINE_ARCH} == "m68000" || \
     ${MACHINE_GNU_ARCH} == "sh" || \
     ${MACHINE_GNU_ARCH} == "shle" || \
@@ -674,6 +677,7 @@ APPEND_ELF=         elf
     ${TARGET_MACHINE_GNU_ARCH} == "arm" || \
     ${TARGET_MACHINE_ARCH} == "i386" || \
     ${TARGET_MACHINE_ARCH} == "m68k" || \
+    ${TARGET_MACHINE_ARCH} == "m68ksf" || \
     ${TARGET_MACHINE_ARCH} == "m68000" || \
     ${TARGET_MACHINE_GNU_ARCH} == "sh" || \
     ${TARGET_MACHINE_GNU_ARCH} == "shle" || \
@@ -688,7 +692,7 @@ NATIVE_APPEND_ABI=  -${NATIVE_MACHINE_ARC
 APPEND_ABI=            -${MACHINE_ARCH:C/eb//:C/v[4-7]//:S/earm/eabi/}
 .  endif
 .  if !empty(TARGET_MACHINE_ARCH:Mearm*)
-TARGET_APPEND_ABI=     -${TARGET_MACHINE_ARCH:C/eb//:C/v[4-7]//:S/earm/eabi/}
+TARGET_APPEND_ABI=     -${TARGET_MACHINE_ARCH:C/eb//:C/v[4-7]//:S/earm/eabi/:S/m68ksf/m68k/}
 .  endif
 .endif
 
@@ -1051,7 +1055,7 @@ _SYS_VARS.dirs=           WRKDIR DESTDIR PREFIX P
 #
 # Keywords: BROKEN_ON_PLATFORM 32bit
 #
-LP32PLATFORMS=         *-*-earm* *-*-hppa *-*-i386 *-*-m68000 *-*-m68k \
+LP32PLATFORMS=         *-*-earm* *-*-hppa *-*-i386 *-*-m68000 *-*-m68ksf *-*-m68k \
                        *-*-mipseb *-*-mipsel *-*-powerpc *-*-riscv32 \
                        *-*-sparc *-*-vax
 
@@ -1069,7 +1073,7 @@ LP64PLATFORMS=            *-*-aarch64 *-*-aarch64e
 #
 # Keywords: BROKEN_ON_PLATFORM little-endian big-endian endian
 #
-_BIGENDIANCPUS=                coldfire hppa m68000 m68k mips64eb mipseb or1k \
+_BIGENDIANCPUS=                coldfire hppa m68000 m68ksf m68k mips64eb mipseb or1k \
                        powerpc powerpc64 sh3eb sparc sparc64
 _LITTLEENDIANCPUS=     alpha i386 ia64 mips64el mipsel powerpc64le riscv32 \
                        riscv64 sh3el vax x86_64

Index: pkgsrc/mk/gnu-config/config.guess
diff -u pkgsrc/mk/gnu-config/config.guess:1.25 pkgsrc/mk/gnu-config/config.guess:1.26
--- pkgsrc/mk/gnu-config/config.guess:1.25      Fri Sep  2 09:06:44 2022
+++ pkgsrc/mk/gnu-config/config.guess   Wed Oct 22 08:37:18 2025
@@ -230,7 +230,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
            earm*)
                os=netbsdelf
                ;;
-           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+           arm*|i386|m68ksf|m68k|ns32k|sh3*|sparc|vax)
                set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                        | grep -q __ELF__

Index: pkgsrc/mk/gnu-config/config.sub
diff -u pkgsrc/mk/gnu-config/config.sub:1.29 pkgsrc/mk/gnu-config/config.sub:1.30
--- pkgsrc/mk/gnu-config/config.sub:1.29        Thu May  9 17:42:15 2024
+++ pkgsrc/mk/gnu-config/config.sub     Wed Oct 22 08:37:18 2025
@@ -1204,7 +1204,7 @@ case $cpu-$vendor in
                        | lm32 \
                        | loongarch32 | loongarch64 | loongarchx32 \
                        | m32c | m32r | m32rle \
-                       | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+                       | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68ksf | m68k \
                        | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
                        | m88110 | m88k | maxq | mb | mcore | mep | metag \
                        | microblaze | microblazeel \