svn commit: r355034 - in head: lib lib/libclang_rt tools/build/mk

[Dimitry Andric]

Author: dim
Date: Sat Nov 23 19:35:09 2019
New Revision: 355034
URL: https://svnweb.freebsd.org/changeset/base/355034

Log:
  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
  MFC after:	1 month
  X-MFC-With:	r353358

Modified:
  head/lib/Makefile
  head/lib/libclang_rt/Makefile.inc
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Sat Nov 23 17:25:09 2019	(r355033)
+++ head/lib/Makefile	Sat Nov 23 19:35:09 2019	(r355034)
@@ -159,7 +159,8 @@ SUBDIR.${MK_STATS}+=	libstats
 # 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: head/lib/libclang_rt/Makefile.inc
==============================================================================
--- head/lib/libclang_rt/Makefile.inc	Sat Nov 23 17:25:09 2019	(r355033)
+++ head/lib/libclang_rt/Makefile.inc	Sat Nov 23 19:35:09 2019	(r355034)
@@ -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/compiler-rt
 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Nov 23 17:25:09 2019	(r355033)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Nov 23 19:35:09 2019	(r355034)
@@ -1576,6 +1576,8 @@ OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
+OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-i386.a