From: Derrick Brashear <shadow@dementix.org>
Date: Mon, 16 Jul 2012 19:16:53 +0000 (-0400)
Subject: macos: future-proof MakefileProto.DARWIN.in
X-Git-Tag: upstream/1.6.2^2~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5b6a1a619d073c895b938032f5f1b37fcfa7040f;p=packages%2Fo%2Fopenafs.git

macos: future-proof MakefileProto.DARWIN.in

if new cases show up which match the current ones, they just work.
darwin60 and older were already killed from the tree, kill here also

Reviewed-on: http://gerrit.openafs.org/7782
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit e6aa586a996e32b3def4b8108815730fcfbf1463)

Change-Id: I66bb6eb54856a37d3ff14cf455d90c482443a00e
Reviewed-on: http://gerrit.openafs.org/8912
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>
---

diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in
index 96ae6cdc8..15a113a85 100644
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@@ -41,13 +41,13 @@ DBUG =
 DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL
 KINCLUDES=-I${KROOT}/System/Library/Frameworks/Kernel.framework/Headers
 
-<ppc_darwin_80 x86_darwin_80>
+<ppc_darwin_70 ppc_darwin_80 x86_darwin_80>
 KOPTS_DBUG=-g
 <ppc_darwin_90 x86_darwin_90>
 KOPTS_DBUG=-ggdb
-<x86_darwin_100 x86_darwin_110>
+<all -ppc_darwin_70 -ppc_darwin_80 -x86_darwin_80 -ppc_darwin_90 -x86_darwin_90>
 KOPTS_DBUG=-gdwarf-2
-<ppc_darwin_80 x86_darwin_80 ppc_darwin_90 x86_darwin_90 x86_darwin_100 x86_darwin_110>
+<all -ppc_darwin_70>
 KOPTS_ppc=-static -nostdinc -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch ppc -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED -mcpu=750 -mmultiple -fschedule-insns -force_cpusubtype_ALL
 KOPTS_x86=-static -nostdinc -fmessage-length=0 -pipe -nostdinc -fno-builtin -Wno-trigraphs -force_cpusubtype_ALL -msoft-float -O0 -fno-common -mkernel -finline -fno-keep-inline-functions -fasm-blocks -arch i386 -Di386 -DI386 -D__I386__ -DPAGE_SIZE_FIXED
 KOPTS_amd64=-static -nostdinc -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch x86_64 -Damd64 -DAMD64 -D__AMD64__ -DPAGE_SIZE_FIXED -march=x86-64 -mpreferred-stack-boundary=4 -falign-functions=4 -m64 -mkernel -mno-red-zone
@@ -58,9 +58,9 @@ OBJ_ppc=$(shell echo "${ARCH_ppc}" | grep -q -w yes && echo "$@.ppc")
 OBJ_x86=$(shell echo "${ARCH_x86}" | grep -q -w yes && echo "$@.x86")
 OBJ_amd64=$(shell echo "${ARCH_amd64}" | grep -q -w yes && echo "$@.amd64")
 
-<x86_darwin_100 x86_darwin_110>
+<all -ppc_darwin_70 -ppc_darwin_80 -x86_darwin_80 -ppc_darwin_90 -x86_darwin_90>
 MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib $(ARCHFLAGS) -Xlinker -kext
-<all -x86_darwin_100 -x86_darwin_110>
+<ppc_darwin_70 ppc_darwin_80 x86_darwin_80 ppc_darwin_90 x86_darwin_90>
 MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib $(ARCHFLAGS)
 <all>
 
@@ -79,7 +79,7 @@ DESTDIRS = single_destdir
 
 include Makefile.common
 
-<ppc_darwin_80 x86_darwin_80 ppc_darwin_90 x86_darwin_90 x86_darwin_100 x86_darwin_110>
+<all -ppc_darwin_70>
 # override suffix rule; unfortunately, this causes a warning message
 .c.o:
 	if [ "$(ARCH_ppc)" = "yes" ]; then \
@@ -103,14 +103,9 @@ CRULE_OPT_x86=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_x86) $(
 CRULE_OPT_amd64=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_amd64) $(CFLAGS-$@) -o $(patsubst %.o,%.o.amd64,$@) -c $? 
 CRULE_OPT=$(shell echo "${ARCH_ppc}" | grep -q -w yes && echo "${CRULE_OPT_ppc} && "; echo "${ARCH_x86}" | grep -q -w yes && echo "${CRULE_OPT_x86} && "; echo "${ARCH_amd64}" | grep -q -w yes && echo "${CRULE_OPT_amd64} && ";echo "lipo -create ${OBJ_ppc} ${OBJ_x86} ${OBJ_amd64} -output $@")
 
-<all -ppc_darwin_80 -x86_darwin_80 -ppc_darwin_90 -x86_darwin_90 -x86_darwin_100 -x86_darwin_110>
-CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS)
 <ppc_darwin_70>
+CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS)
 KOPTS=-static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch 
-<ppc_darwin_60>
-KOPTS=-no-cpp-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch 
-<ppc_darwin_14 ppc_darwin_13 ppc_darwin_12>
-KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch 
 
 <all>
 setup:
@@ -132,14 +127,14 @@ INST_LIBAFS = ${DESTDIR}${afskerneldir}/afs-nfs.kext
 INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/afs.kext
 DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/afs-nfs.kext
 DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/afs.kext
-<all -ppc_darwin_90 -x86_darwin_90 -x86_darwin_100 -x86_darwin_110>
+<ppc_darwin_70 ppc_darwin_80 x86_darwin_80>
 LIBAFSDSYM =
 LIBAFSNONFSDSYM =
 INST_LIBAFSDSYM =
 INST_LIBAFSNONFSDSYM =
 DEST_LIBAFSDSYM =
 DEST_LIBAFSNONFSDSYM =
-<ppc_darwin_90 x86_darwin_90 x86_darwin_100 x86_darwin_110>
+<all -ppc_darwin_70 -ppc_darwin_80 -x86_darwin_80>
 LIBAFSDSYM = libafs.o.dSYM
 LIBAFSNONFSDSYM = libafs.nonfs.o.dSYM
 INST_LIBAFSDSYM = ${DESTDIR}${afskerneldir}/afs-nfs.kext.dSYM
@@ -155,7 +150,7 @@ install_libafs: $(LIBAFSNONFS) $(LIBAFSNONFSDSYM) ;
 	$(INSTALL) -m 644 ../${DARWIN_INFOFILE} ${INST_LIBAFSNONFS}/Contents/Info.plist
 	-mkdir -p ${INST_LIBAFSNONFS}/Contents/MacOS
 	$(INSTALL) -m 644 ${LIBAFSNONFS} ${INST_LIBAFSNONFS}/Contents/MacOS/afs
-<ppc_darwin_90 x86_darwin_90 x86_darwin_100 x86_darwin_110>
+<all -ppc_darwin_70 -ppc_darwin_80 -x86_darwin_80>
 	-mkdir -p ${INST_LIBAFSNONFSDSYM}/Contents/Resources/DWARF
 	$(INSTALL) ${LIBAFSNONFSDSYM}/Contents/Info.plist ${INST_LIBAFSNONFSDSYM}/Contents
 	$(INSTALL) ${LIBAFSNONFSDSYM}/Contents/Resources/DWARF/${LIBAFSNONFS} ${INST_LIBAFSNONFSDSYM}/Contents/Resources/DWARF
@@ -167,7 +162,7 @@ dest_libafs: $(LIBAFSNONFS) $(LIBAFSNONFSDSYM) ;
 	$(INSTALL) -m 644 ../${DARWIN_INFOFILE} ${DEST_LIBAFSNONFS}/Contents/Info.plist
 	-mkdir -p ${DEST_LIBAFSNONFS}/Contents/MacOS
 	$(INSTALL) -m 644 ${LIBAFSNONFS} ${DEST_LIBAFSNONFS}/Contents/MacOS/afs
-<ppc_darwin_90 x86_darwin_90 x86_darwin_100 x86_darwin_110>
+<all -ppc_darwin_70 -ppc_darwin_80 -x86_darwin_80>
 	-mkdir -p ${DEST_LIBAFSNONFSDSYM}/Contents/Resources/DWARF
 	$(INSTALL) ${LIBAFSNONFSDSYM}/Contents/Info.plist ${DEST_LIBAFSNONFSDSYM}/Contents
 	$(INSTALL) ${LIBAFSNONFSDSYM}/Contents/Resources/DWARF/${LIBAFSNONFS} ${DEST_LIBAFSNONFSDSYM}/Contents/Resources/DWARF
@@ -179,7 +174,7 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
 	$(MODLD) -r -o ${LIBAFSNONFS} ${AFSAOBJS} ${AFSNONFSOBJS} -lcc_kext
 
-<ppc_darwin_90 x86_darwin_90 x86_darwin_100 x86_darwin_110>
+<all -ppc_darwin_70 -ppc_darwin_80 -x86_darwin_80>
 $(LIBAFSDSYM): ${LIBAFS}
 	dsymutil -o ${LIBAFS}.dSYM ${LIBAFS}
 ${LIBAFSNONFSDSYM}: ${LIBAFSNONFS}