svn commit: r311934 - in stable/11: . tools/build/mk usr.bin/clang/llvm-ar

[Dimitry Andric]

Author: dim
Date: Wed Jan 11 20:21:05 2017
New Revision: 311934
URL: https://svnweb.freebsd.org/changeset/base/311934

Log:
  MFC r311565:
  
  Link llvm-ar to llvm-ranlib, if WITH_CLANG_EXTRAS is enabled.  When
  invoked as llvm-ranlib, it can create an archive symbol table for
  archives of objects compiled for LTO by an LLVM compiler.
  
  Submitted by:	Dan McGregor <danismostlikely at gmail.com>
  
  MFC r311806:
  
  After r311565, also remove llvm-ranlib from ObsoleteFiles.inc.

Modified:
  stable/11/ObsoleteFiles.inc
  stable/11/tools/build/mk/OptionalObsoleteFiles.inc
  stable/11/usr.bin/clang/llvm-ar/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/ObsoleteFiles.inc
==============================================================================
--- stable/11/ObsoleteFiles.inc	Wed Jan 11 20:00:24 2017	(r311933)
+++ stable/11/ObsoleteFiles.inc	Wed Jan 11 20:21:05 2017	(r311934)
@@ -2177,7 +2177,6 @@ OLD_LIBS+=usr/lib32/private/libyaml.so.1
 OLD_FILES+=usr/lib32/private/libyaml_p.a
 # 20140216: new clang import which bumps version from 3.3 to 3.4.
 OLD_FILES+=usr/bin/llvm-prof
-OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.3/altivec.h

Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jan 11 20:00:24 2017	(r311933)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jan 11 20:21:05 2017	(r311934)
@@ -1493,6 +1493,7 @@ OLD_FILES+=usr/bin/llvm-mc
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-pdbdump
+OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/opt

Modified: stable/11/usr.bin/clang/llvm-ar/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-ar/Makefile	Wed Jan 11 20:00:24 2017	(r311933)
+++ stable/11/usr.bin/clang/llvm-ar/Makefile	Wed Jan 11 20:21:05 2017	(r311934)
@@ -7,4 +7,6 @@ SRCS+=		llvm-ar.cpp
 
 LIBADD+=	z
 
+LINKS+=		${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib
+
 .include "../llvm.prog.mk"