d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create one list of replacements for MACHINE_CPUARCH as MACHINE_CPUARCH_SUB.

Browse Source 
This also adds missing s/aarch64/arm64 to the sys.mk version and also
adds back armv6hf for universe since it was added to the sys.mk version
in r300438.

MFC after:	3 days
Sponsored by:	EMC / Isilon Storage Division
Differential Revision:	https://reviews.freebsd.org/D7159
This commit is contained in:
Bryan Drewery 2016-07-12 18:57:25 +00:00
parent db16ab7ea0
commit 8a6bdc134d
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -235,7 +235,7 @@ _MAKE+= MK_META_MODE=no
_TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/} _TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/}
.elif !defined(TARGET) && defined(TARGET_ARCH) && \ .elif !defined(TARGET) && defined(TARGET_ARCH) && \
${TARGET_ARCH} != ${MACHINE_ARCH} ${TARGET_ARCH} != ${MACHINE_ARCH}
_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/} _TARGET= ${TARGET_ARCH:${MACHINE_CPUARCH_SUB:ts:}}
.endif .endif
.if defined(TARGET) && !defined(_TARGET) .if defined(TARGET) && !defined(_TARGET)
_TARGET=${TARGET} _TARGET=${TARGET}

2
gnu/usr.bin/binutils/Makefile.inc0
View File

@ -7,7 +7,7 @@
VERSION= "2.17.50 [FreeBSD] 2007-07-03" VERSION= "2.17.50 [FreeBSD] 2007-07-03"
.if defined(TARGET_ARCH) .if defined(TARGET_ARCH)
TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc64/powerpc/} TARGET_CPUARCH=${TARGET_ARCH:${MACHINE_CPUARCH_SUB:ts:}}
.else .else
TARGET_CPUARCH=${MACHINE_CPUARCH} TARGET_CPUARCH=${MACHINE_CPUARCH}
.endif .endif

2
gnu/usr.bin/cc/Makefile.tgt
View File

@ -4,7 +4,7 @@
# MACHINE_CPUARCH, but there's no easy way to export make functions... # MACHINE_CPUARCH, but there's no easy way to export make functions...
.if defined(TARGET_ARCH) .if defined(TARGET_ARCH)
TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc64/powerpc/} TARGET_CPUARCH=${TARGET_ARCH:${MACHINE_CPUARCH_SUB:ts:}}
.else .else
TARGET_CPUARCH=${MACHINE_CPUARCH} TARGET_CPUARCH=${MACHINE_CPUARCH}
.endif .endif

2
gnu/usr.bin/gdb/Makefile.inc
View File

@ -23,7 +23,7 @@ OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline
# MACHINE_CPUARCH, but there's no easy way to export make functions... # MACHINE_CPUARCH, but there's no easy way to export make functions...
.if defined(TARGET_ARCH) .if defined(TARGET_ARCH)
TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc64/powerpc/} TARGET_CPUARCH=${TARGET_ARCH:${MACHINE_CPUARCH_SUB:ts:}}
.else .else
TARGET_CPUARCH=${MACHINE_CPUARCH} TARGET_CPUARCH=${MACHINE_CPUARCH}
.endif .endif

2
gnu/usr.bin/gdb/libgdb/Makefile
View File

@ -4,7 +4,7 @@
# MACHINE_CPUARCH, but there's no easy way to export make functions... # MACHINE_CPUARCH, but there's no easy way to export make functions...
.if defined(TARGET_ARCH) .if defined(TARGET_ARCH)
TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc64/powerpc/} TARGET_CPUARCH=${TARGET_ARCH:${MACHINE_CPUARCH_SUB:ts:}}
.else .else
TARGET_CPUARCH=${MACHINE_CPUARCH} TARGET_CPUARCH=${MACHINE_CPUARCH}
.endif .endif

8
share/mk/sys.mk
View File

@ -13,7 +13,13 @@ unix ?= We run FreeBSD, not UNIX.
# and/or endian. This is called MACHINE_CPU in NetBSD, but that's used # and/or endian. This is called MACHINE_CPU in NetBSD, but that's used
# for something different in FreeBSD. # for something different in FreeBSD.
# #
MACHINE_CPUARCH=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/powerpc64/powerpc/:C/riscv64/riscv/} MACHINE_CPUARCH_SUB= \
C/mips(n32|64)?(el)?/mips/ \
C/arm(v6)?(eb|hf)?/arm/ \
C/aarch64/arm64/ \
C/powerpc64/powerpc/ \
C/riscv64/riscv/
MACHINE_CPUARCH=${MACHINE_ARCH:${MACHINE_CPUARCH_SUB:ts:}}
.endif .endif