From a3f27333c5521fdc52314bf510943c602b3cd1a0 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 10 Jun 2011 02:11:26 -0400 Subject: [PATCH] darwin armv6 and armv7 support simply compile lwp process assembler for both arm arches. Change-Id: Ie09ec1e3684656a492373f86e4c8be71e6abfabd Reviewed-on: http://gerrit.openafs.org/4832 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/lwp/Makefile.in | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 672bc1bd9..35c1281ff 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -77,40 +77,47 @@ process.o : process.s process.i386.s process.c lwp.o ppc=`echo $${CURRENTBUILDARCH} | grep -q ppc && echo process.ppc.o` ; \ i386=`echo $${CURRENTBUILDARCH} | grep -q i386 && echo process.i386.o` ; \ amd64=`echo $${CURRENTBUILDARCH} | grep -q x86_64 && echo process.amd64.o` ; \ - arm=`echo $${CURRENTBUILDARCH} | grep -q arm && echo process.arm.o` ; \ - if [ -z "$${ppc}" -a -z "$${i386}" -a -z "$${amd64}" -a -z "$${arm}" ] ; then \ + armv6=`echo $${CURRENTBUILDARCH} | grep -q armv6 && echo process.armv6.o` ; \ + armv7=`echo $${CURRENTBUILDARCH} | grep -q armv7 && echo process.armv7.o` ; \ + if [ -z "$${ppc}" -a -z "$${i386}" -a -z "$${amd64}" -a -z "$${armv6}" -a -z "$${armv7}" ] ; then \ if [ `arch` = ppc ] ; then \ ppc=yes ; \ else \ i386=yes ; \ fi ; \ fi ; \ - if [ -n "$${arm}" ] ; then \ - $(CC) -x assembler-with-cpp -c -arch armv6 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.s -o "$${arm}" ; \ - if [ -z "$${i386}" -a -z "$${amd64}" -a -z "$${ppc}" ] ; then \ - ${MV} "$${arm}" process.o ; \ + if [ -n "$${armv6}" ] ; then \ + $(CC) -x assembler-with-cpp -c -arch armv6 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.s -o "$${armv6}" ; \ + if [ -z "$${i386}" -a -z "$${amd64}" -a -z "$${ppc}" -a -z "$${armv7}" ] ; then \ + ${MV} "$${armv6}" process.o ; \ + fi ; \ + fi ; \ + if [ -n "$${armv7}" ] ; then \ + $(CC) -x assembler-with-cpp -c -arch armv7 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.s -o "$${armv7}" ; \ + if [ -z "$${i386}" -a -z "$${amd64}" -a -z "$${ppc}" -a -z "$${armv6}" ] ; then \ + ${MV} "$${armv7}" process.o ; \ fi ; \ fi ; \ if [ -n "$${ppc}" ] ; then \ $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c -arch ppc -I${TOP_INCDIR} ${srcdir}/process.s -o "$${ppc}" ; \ - if [ -z "$${i386}" -a -z "$${amd64}" -a -z "$${arm}" ] ; then \ + if [ -z "$${i386}" -a -z "$${amd64}" -a -z "$${armv6}" -a -z "$${armv7}" ] ; then \ ${MV} "$${ppc}" process.o ; \ fi ; \ fi ; \ if [ -n "$${i386}" ] ; then \ $(CC) -x assembler-with-cpp -c -arch i386 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s -o "$${i386}" ; \ - if [ -z "$${ppc}" -a -z "$${amd64}" -a -z "$${arm}" ] ; then \ + if [ -z "$${ppc}" -a -z "$${amd64}" -a -z "$${armv6}" -a -z "$${armv7}" ] ; then \ ${MV} "$${i386}" process.o ; \ fi ; \ fi ; \ if [ -n "$${amd64}" ] ; then \ $(CC) -x assembler-with-cpp -c -arch x86_64 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.amd64.s -o "$${amd64}" ; \ - if [ -z "$${ppc}" -a -z "$${i386}" -a -z "$${arm}" ] ; then \ + if [ -z "$${ppc}" -a -z "$${i386}" -a -z "$${armv6}" -a -z "$${armv7}" ] ; then \ ${MV} "$${amd64}" process.o ; \ fi ; \ fi ; \ if [ ! -f process.o ] ; then \ - lipo -create $${amd64} $${i386} $${ppc} $${arm} -output process.o ;\ + lipo -create $${amd64} $${i386} $${ppc} $${armv6} $${armv7} -output process.o ;\ fi ;; \ i386_*bsd*) \ cp ${srcdir}/process.i386.s process.S ; \ -- 2.39.5