svn commit: r356498 - in stable/12/lib: . libclang_rt

[Dimitry Andric]

Author: dim
Date: Wed Jan  8 17:23:52 2020
New Revision: 356498
URL: https://svnweb.freebsd.org/changeset/base/356498

Log:
  MFC r355034:
  
  libclang_rt: enable on powerpc*
  
  Summary:
  Enable on powerpc64 and in lib/libclang_rt/Makefile change
  MACHINE_CPUARCH to MACHINE_ARCH because on powerpc64
  MACHINE_ARCH==MACHINE_CPUARCH so the 32-bit library overwrites 64-bit
  library during installworld.
  
  This patch doesn't enable any other libclang_rt libraries because they
  need to be separately ported.
  
  I have verified that games/julius (which fails on powerpc64 elfv2
  without this change because of no libclang_rt profiling library) builds.
  
  Test Plan: Ship it, test on powerpc and powerpcspe
  
  Submitted by:	pkubaj
  Reviewed by:	dim, jhibbits
  Differential Revision: https://reviews.freebsd.org/D22425

Modified:
  stable/12/lib/Makefile
  stable/12/lib/libclang_rt/Makefile.inc
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/lib/Makefile
==============================================================================
--- stable/12/lib/Makefile	Wed Jan  8 17:05:57 2020	(r356497)
+++ stable/12/lib/Makefile	Wed Jan  8 17:23:52 2020	(r356498)
@@ -158,7 +158,8 @@ SUBDIR.${MK_LDNS}+=	libldns
 # built for certain architectures.
 .if ${MK_CLANG} != "no" && ${COMPILER_TYPE} == "clang" && \
     (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
-    ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386")
+    ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" || \
+    ${MACHINE_CPUARCH} == "powerpc")
 _libclang_rt=	libclang_rt
 .endif
 

Modified: stable/12/lib/libclang_rt/Makefile.inc
==============================================================================
--- stable/12/lib/libclang_rt/Makefile.inc	Wed Jan  8 17:05:57 2020	(r356497)
+++ stable/12/lib/libclang_rt/Makefile.inc	Wed Jan  8 17:23:52 2020	(r356498)
@@ -8,7 +8,7 @@
     (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 CRTARCH?=	armhf
 .else
-CRTARCH?=	${MACHINE_CPUARCH:C/amd64/x86_64/}
+CRTARCH?=	${MACHINE_ARCH:C/amd64/x86_64/}
 .endif
 CRTSRC=		${SRCTOP}/contrib/llvm-project/compiler-rt