From: Benjamin Kaduk Date: Fri, 14 Mar 2014 15:13:15 +0000 (-0400) Subject: libafs: DARWIN: update for Xcode 5.1 X-Git-Tag: upstream/1.6.8^2~19 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=dfa4f822f6696d1a3ba84ee9bfa63fce96fa503a;p=packages%2Fo%2Fopenafs.git libafs: DARWIN: update for Xcode 5.1 (1) remove -mlong-branch from amd64 build Random internet postings suggest that it has triggered a warning since at least Xcode 3.2, and the gcc manual page suggests that it is only applicable on ppc, anyway. (2) remove -mpreferred-stack-boundary=4 from the amd64 build The evidence here shows up less readily in an internet search, but it seems that Apple's compilers will force the stack alignment to 16 bytes regardless of what is passed here. One poster had trouble with -mpreferred-stack-boundary being unused in Xcode 4.4.1 This change only fixes warnings reported as errors by buildbot; it does not attempt to fully synchronize with the flags that Xcode 5.1 uses for kernel module builds. Reviewed-on: http://gerrit.openafs.org/10896 Tested-by: BuildBot Reviewed-by: D Brashear (cherry picked from commit cb18fbde6536942e4bc87bd5943a13cc14fbe332) Change-Id: Ic66d9028e4f15bd7a9d7c80db84087879560f4d2 Reviewed-on: http://gerrit.openafs.org/10926 Tested-by: BuildBot Tested-by: Andrew Deason Reviewed-by: D Brashear Reviewed-by: Stephan Wiesand --- diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index 15a113a85..ddd401a30 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -50,7 +50,7 @@ KOPTS_DBUG=-gdwarf-2 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 +KOPTS_amd64=-static -nostdinc -fno-builtin -finline -fno-keep-inline-functions -msoft-float -fsigned-bitfields -arch x86_64 -Damd64 -DAMD64 -D__AMD64__ -DPAGE_SIZE_FIXED -march=x86-64 -falign-functions=4 -m64 -mkernel -mno-red-zone ARCH_ppc=$(shell echo "${ARCHFLAGS}" | grep -q -w ppc && echo yes || echo ${ARCHFLAGS} | egrep -q -w -v 'ppc|i386|x86_64' && arch | grep -q -w ppc && echo yes) ARCH_x86=$(shell echo "${ARCHFLAGS}" | grep -q -w i386 && echo yes || echo ${ARCHFLAGS} | egrep -q -w -v 'ppc|i386|x86_64' && arch | grep -q -w i386 && echo yes) ARCH_amd64=$(shell echo "${ARCHFLAGS}" | grep -q -w x86_64 && echo yes || echo ${ARCHFLAGS} | egrep -q -w -v 'ppc|i386|x86_64' && arch | grep -q -w x86_64 && echo yes)