svn commit: r322521 - in head/gnu/usr.bin: binutils binutils/ld binutils/libbfd cc

[Warner Losh]

Author: imp
Date: Mon Aug 14 22:25:20 2017
New Revision: 322521
URL: https://svnweb.freebsd.org/changeset/base/322521

Log:
  Convert all the arm big endian tests into a regexp rather than a list.
  
  Suggested by: emaste@

Modified:
  head/gnu/usr.bin/binutils/Makefile.inc0
  head/gnu/usr.bin/binutils/ld/Makefile.arm
  head/gnu/usr.bin/binutils/libbfd/Makefile.arm
  head/gnu/usr.bin/cc/Makefile.inc
  head/gnu/usr.bin/cc/Makefile.tgt

Modified: head/gnu/usr.bin/binutils/Makefile.inc0
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile.inc0	Mon Aug 14 21:48:50 2017	(r322520)
+++ head/gnu/usr.bin/binutils/Makefile.inc0	Mon Aug 14 22:25:20 2017	(r322521)
@@ -16,7 +16,7 @@ TARGET_VENDOR?=	unknown
 TARGET_OS?=	freebsd
 BINUTILS_ARCH=${TARGET_ARCH:C/amd64/x86_64/}
 TARGET_TUPLE?=	${BINUTILS_ARCH}-${TARGET_VENDOR}-${TARGET_OS}
-.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH} == "armv6eb" || \
+.if ${TARGET_ARCH:Marm*eb} != "" || \
 	(${TARGET_CPUARCH} == "mips" && ${TARGET_ARCH:Mmips*el*} == "")
 TARGET_BIG_ENDIAN=t
 .endif

Modified: head/gnu/usr.bin/binutils/ld/Makefile.arm
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile.arm	Mon Aug 14 21:48:50 2017	(r322520)
+++ head/gnu/usr.bin/binutils/ld/Makefile.arm	Mon Aug 14 22:25:20 2017	(r322521)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH} == "armv6eb"
+.if ${TARGET_ARCH:Marm*eb} != ""
 NATIVE_EMULATION= armelfb_fbsd
 .else
 NATIVE_EMULATION= armelf_fbsd

Modified: head/gnu/usr.bin/binutils/libbfd/Makefile.arm
==============================================================================
--- head/gnu/usr.bin/binutils/libbfd/Makefile.arm	Mon Aug 14 21:48:50 2017	(r322520)
+++ head/gnu/usr.bin/binutils/libbfd/Makefile.arm	Mon Aug 14 22:25:20 2017	(r322521)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH} == "armv6eb"
+.if ${TARGET_ARCH:Marm*eb} != ""
 DEFAULT_VECTOR=	bfd_elf32_bigarm_vec
 .else
 DEFAULT_VECTOR=	bfd_elf32_littlearm_vec
@@ -14,7 +14,7 @@ SRCS+=	cpu-arm.c \
 	elflink.c
 
 VECS+=	${DEFAULT_VECTOR}
-.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH} == "armv6eb"
+.if ${TARGET_ARCH:Marm*eb} != ""
 VECS+=	bfd_elf32_littlearm_vec
 .else
 VECS+=	bfd_elf32_bigarm_vec

Modified: head/gnu/usr.bin/cc/Makefile.inc
==============================================================================
--- head/gnu/usr.bin/cc/Makefile.inc	Mon Aug 14 21:48:50 2017	(r322520)
+++ head/gnu/usr.bin/cc/Makefile.inc	Mon Aug 14 22:25:20 2017	(r322521)
@@ -31,7 +31,7 @@ CFLAGS+=	-DCROSS_DIRECTORY_STRUCTURE
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
-.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH} == "armv6eb"
+.if ${TARGET_ARCH:Marm*eb} != ""
 CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END
 .endif
 .if ${TARGET_ARCH} == "armv6" || ${TARGET_ARCH} == "armv6eb"

Modified: head/gnu/usr.bin/cc/Makefile.tgt
==============================================================================
--- head/gnu/usr.bin/cc/Makefile.tgt	Mon Aug 14 21:48:50 2017	(r322520)
+++ head/gnu/usr.bin/cc/Makefile.tgt	Mon Aug 14 22:25:20 2017	(r322521)
@@ -14,7 +14,7 @@ GCC_CPU=${TARGET_CPUARCH:C/amd64/i386/:C/powerpc/rs600
 .if ${TARGET_ARCH} == "sparc64"
 TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc
 .endif
-.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH} == "armv6eb" || \
+.if ${TARGET_ARCH:Marm*eb} != "" || \
 	(${TARGET_CPUARCH} == "mips" && ${TARGET_ARCH:Mmips*el*} == "")
 TARGET_BIG_ENDIAN=t
 .endif