Re: ARM ABI changes/combinations (was Re: Preparation for creating netbsd-7 branch)

[Jeff Rizzo <riz%NetBSD.org@localhost>]

On 7/25/14, 12:28 AM, Alan Barrett wrote:
> I don't care which of the two you keep, but I think it's ugly to have 
> two aliases that mean the same thing.

After thinking about it some more, I've adopted your original 
suggestion.  Here's what I want to commit, probably tomorrow.


Index: build.sh
===================================================================
RCS file: /cvsroot/src/build.sh,v
retrieving revision 1.285
diff -u -r1.285 build.sh
--- build.sh    6 Jul 2014 18:04:44 -0000       1.285
+++ build.sh    26 Jul 2014 00:23:41 -0000
@@ -602,17 +602,17 @@
 MACHINE=arc            MACHINE_ARCH=mipsel     DEFAULT
 MACHINE=atari          MACHINE_ARCH=m68k
 MACHINE=bebox          MACHINE_ARCH=powerpc
-MACHINE=cats           MACHINE_ARCH=arm        DEFAULT
-MACHINE=cats           MACHINE_ARCH=earmv4     ALIAS=ecats
+MACHINE=cats           MACHINE_ARCH=arm        ALIAS=ocats
+MACHINE=cats           MACHINE_ARCH=earmv4     ALIAS=ecats DEFAULT
 MACHINE=cesfic         MACHINE_ARCH=m68k
 MACHINE=cobalt         MACHINE_ARCH=mips64el   ALIAS=cobalt64
 MACHINE=cobalt         MACHINE_ARCH=mipsel     DEFAULT
 MACHINE=dreamcast      MACHINE_ARCH=sh3el
 MACHINE=emips          MACHINE_ARCH=mipseb
 MACHINE=epoc32         MACHINE_ARCH=arm
-MACHINE=evbarm         MACHINE_ARCH=arm        ALIAS=evbarm-el DEFAULT
-MACHINE=evbarm         MACHINE_ARCH=armeb      ALIAS=evbarm-eb
-MACHINE=evbarm         MACHINE_ARCH=earm       ALIAS=evbearm-el
+MACHINE=evbarm         MACHINE_ARCH=arm        ALIAS=evboarm-el
+MACHINE=evbarm         MACHINE_ARCH=armeb      ALIAS=evboarm-eb
+MACHINE=evbarm         MACHINE_ARCH=earm       ALIAS=evbearm-el DEFAULT
 MACHINE=evbarm         MACHINE_ARCH=earmeb     ALIAS=evbearm-eb
 MACHINE=evbarm         MACHINE_ARCH=earmhf     ALIAS=evbearmhf-el
 MACHINE=evbarm         MACHINE_ARCH=earmhfeb   ALIAS=evbearmhf-eb
@@ -642,15 +642,16 @@
 MACHINE=ews4800mips    MACHINE_ARCH=mipseb
 MACHINE=hp300          MACHINE_ARCH=m68k
 MACHINE=hppa           MACHINE_ARCH=hppa
-MACHINE=hpcarm         MACHINE_ARCH=arm        DEFAULT
+MACHINE=hpcarm         MACHINE_ARCH=arm        ALIAS=hpcoarm
 MACHINE=hpcarm         MACHINE_ARCH=earm       ALIAS=hpcearm
+MACHINE=hpcarm         MACHINE_ARCH=earmv4     ALIAS=hpcearmv4 DEFAULT
 MACHINE=hpcmips                MACHINE_ARCH=mipsel
 MACHINE=hpcsh          MACHINE_ARCH=sh3el
 MACHINE=i386           MACHINE_ARCH=i386
 MACHINE=ia64           MACHINE_ARCH=ia64
 MACHINE=ibmnws         MACHINE_ARCH=powerpc
-MACHINE=iyonix         MACHINE_ARCH=arm        DEFAULT
-MACHINE=iyonix         MACHINE_ARCH=earm       ALIAS=eiyonix
+MACHINE=iyonix         MACHINE_ARCH=arm        ALIAS=oiyonix
+MACHINE=iyonix         MACHINE_ARCH=earm       ALIAS=eiyonix DEFAULT
 MACHINE=landisk                MACHINE_ARCH=sh3el
 MACHINE=luna68k                MACHINE_ARCH=m68k
 MACHINE=mac68k         MACHINE_ARCH=m68k
@@ -660,8 +661,8 @@
 MACHINE=mmeye          MACHINE_ARCH=sh3eb
 MACHINE=mvme68k                MACHINE_ARCH=m68k
 MACHINE=mvmeppc                MACHINE_ARCH=powerpc
-MACHINE=netwinder      MACHINE_ARCH=arm        DEFAULT
-MACHINE=netwinder      MACHINE_ARCH=earmv4     ALIAS=enetwinder
+MACHINE=netwinder      MACHINE_ARCH=arm        ALIAS=onetwinder
+MACHINE=netwinder      MACHINE_ARCH=earmv4     ALIAS=enetwinder DEFAULT
 MACHINE=news68k                MACHINE_ARCH=m68k
 MACHINE=newsmips       MACHINE_ARCH=mipseb
 MACHINE=next68k                MACHINE_ARCH=m68k
@@ -680,16 +681,16 @@
 MACHINE=sbmips         MACHINE_ARCH=mipsel     ALIAS=sbmips-el
 MACHINE=sgimips                MACHINE_ARCH=mips64eb   ALIAS=sgimips64
 MACHINE=sgimips                MACHINE_ARCH=mipseb     DEFAULT
-MACHINE=shark          MACHINE_ARCH=arm        DEFAULT
-MACHINE=shark          MACHINE_ARCH=earmv4     ALIAS=eshark
+MACHINE=shark          MACHINE_ARCH=arm        ALIAS=oshark
+MACHINE=shark          MACHINE_ARCH=earmv4     ALIAS=eshark DEFAULT
 MACHINE=sparc          MACHINE_ARCH=sparc
 MACHINE=sparc64                MACHINE_ARCH=sparc64
 MACHINE=sun2           MACHINE_ARCH=m68000
 MACHINE=sun3           MACHINE_ARCH=m68k
 MACHINE=vax            MACHINE_ARCH=vax
 MACHINE=x68k           MACHINE_ARCH=m68k
-MACHINE=zaurus         MACHINE_ARCH=arm        DEFAULT
-MACHINE=zaurus         MACHINE_ARCH=earm       ALIAS=ezaurus
+MACHINE=zaurus         MACHINE_ARCH=arm        ALIAS=ozaurus
+MACHINE=zaurus         MACHINE_ARCH=earm       ALIAS=ezaurus DEFAULT
 '
 
 # getarch -- find the default MACHINE_ARCH for a MACHINE,