Date: Mon, 13 Sep 2010 07:15:01 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r212537 - head/usr.sbin/crunch/crunchide Message-ID: <201009130715.o8D7F1DU072292@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Sep 13 07:15:01 2010 New Revision: 212537 URL: http://svn.freebsd.org/changeset/base/212537 Log: It turns out that TARGET_CPUARCH doesn't buy us much here, if anything, but costs us another copy of the transform. Revert it. # Maybe makefile.inc1 should set TARGET_CPUARCH for the cross-tools, but # it doesn't now. That would solve problems in other places too. Submitted by: jmallet@ Modified: head/usr.sbin/crunch/crunchide/Makefile Modified: head/usr.sbin/crunch/crunchide/Makefile ============================================================================== --- head/usr.sbin/crunch/crunchide/Makefile Mon Sep 13 07:03:01 2010 (r212536) +++ head/usr.sbin/crunch/crunchide/Makefile Mon Sep 13 07:15:01 2010 (r212537) @@ -3,14 +3,6 @@ PROG= crunchide SRCS= crunchide.c -# These assignments duplicate much of the functionality of -# MACHINE_CPUARCH, but there's no easy way to export make functions... - -.if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} -.else -TARGET_CPUARCH=${MACHINE_CPUARCH} -.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == i386 && ${MACHINE_ARCH} == i386 @@ -18,9 +10,8 @@ CFLAGS+=-DNLIST_AOUT SRCS+= exec_aout.c .endif -# nb: TARGET_ARCH for powerpc64 is correct here -.if ${TARGET_CPUARCH} == ia64 || ${TARGET_ARCH} == powerpc64 || \ - ${TARGET_CPUARCH} == sparc64 || ${TARGET_CPUARCH} == amd64 +.if ${TARGET_ARCH} == ia64 || ${TARGET_ARCH} == powerpc64 || \ + ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH} == amd64 CFLAGS+=-DNLIST_ELF64 SRCS+= exec_elf64.c exec_elf64.o: exec_elf32.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009130715.o8D7F1DU072292>