CVS commit: pkgsrc/mk/gnu-config

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Wed Nov 13 19:06:42 UTC 2019

Modified Files:
        pkgsrc/mk/gnu-config: config.guess

Log Message:
PR pkg/54686: try to handle NetBSD/arm without architecture version the same
as {e,}armv4 or {e,}armv6 / {e,}armv7. We do not add an explicit version to
our current default (v5).


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/gnu-config/config.guess

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

Modified files:

Index: pkgsrc/mk/gnu-config/config.guess
diff -u pkgsrc/mk/gnu-config/config.guess:1.21 pkgsrc/mk/gnu-config/config.guess:1.22
--- pkgsrc/mk/gnu-config/config.guess:1.21      Fri Jan  4 07:35:25 2019
+++ pkgsrc/mk/gnu-config/config.guess   Wed Nov 13 19:06:42 2019
@@ -187,8 +187,10 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
            sh5el) machine=sh5le-unknown ;;
-           earmv*)
-               arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+           earm*)
+               arch="${UNAME_MACHINE_ARCH#e}"
+               arch="${arch%eb}"
+               arch="${arch%hf}"
                endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
                machine="${arch}${endian}"-unknown
                ;;
@@ -219,7 +221,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
        # Determine ABI tags.
        case "$UNAME_MACHINE_ARCH" in
            earm*)
-               expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+               expr='s/v[0-9]//;s/earm/-eabi/;s/eb$//'
                abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
                ;;
        esac