svn commit: r229131 - in stable/9: lib/clang share/mk

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Dec 31 18:09:31 2011
New Revision: 229131
URL: http://svn.freebsd.org/changeset/base/229131

Log:
  MFC r227775:
  Connect LLVM/clang to the build on powerpc64. After the binutils 2.17.50
  import, it works without issue.

Modified:
  stable/9/lib/clang/clang.build.mk
  stable/9/share/mk/bsd.own.mk
Directory Properties:
  stable/9/lib/clang/   (props changed)
  stable/9/share/mk/   (props changed)

Modified: stable/9/lib/clang/clang.build.mk
==============================================================================
--- stable/9/lib/clang/clang.build.mk	Sat Dec 31 17:56:05 2011	(r229130)
+++ stable/9/lib/clang/clang.build.mk	Sat Dec 31 18:09:31 2011	(r229131)
@@ -9,7 +9,7 @@ CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG
 	-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG
 
 # Correct for gcc miscompilation when compiling on PPC with -O2
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} == "powerpc"
 CFLAGS+= -O1
 .endif
 

Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk	Sat Dec 31 17:56:05 2011	(r229130)
+++ stable/9/share/mk/bsd.own.mk	Sat Dec 31 18:09:31 2011	(r229131)
@@ -428,14 +428,14 @@ __T=${TARGET_ARCH}
 .else
 __T=${MACHINE_ARCH}
 .endif
-# Clang is only for x86 and 32-bit powerpc right now, by default.
-.if ${__T} == "amd64" || ${__T} == "i386" || ${__T} == "powerpc"
+# Clang is only for x86 and powerpc right now, by default.
+.if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*}
 __DEFAULT_YES_OPTIONS+=CLANG
 .else
 __DEFAULT_NO_OPTIONS+=CLANG
 .endif
-# FDT is needed only for arm and powerpc (and not powerpc64)
-.if ${__T} == "arm" || ${__T} == "armeb" || ${__T} == "powerpc"
+# FDT is needed only for arm and powerpc
+.if ${__T:Marm*} || ${__T:Mpowerpc*}
 __DEFAULT_YES_OPTIONS+=FDT
 .else
 __DEFAULT_NO_OPTIONS+=FDT