From owner-svn-src-stable-10@freebsd.org Tue Jan 12 19:33:46 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10C45A66C15; Tue, 12 Jan 2016 19:33:46 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBEC6147F; Tue, 12 Jan 2016 19:33:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CJXi9U036062; Tue, 12 Jan 2016 19:33:44 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CJXiPl036059; Tue, 12 Jan 2016 19:33:44 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201601121933.u0CJXiPl036059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 12 Jan 2016 19:33:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293782 - in stable: 10/contrib/llvm/patches 10/contrib/llvm/tools/clang/tools/driver 10/usr.bin/clang/clang 9/contrib/llvm/patches 9/contrib/llvm/tools/clang/tools/driver 9/usr.bin/cla... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2016 19:33:46 -0000 Author: dim Date: Tue Jan 12 19:33:43 2016 New Revision: 293782 URL: https://svnweb.freebsd.org/changeset/base/293782 Log: MFC r292950: Drop the clang patch which adds recognition of 'CC' suffixes as aliases for --driver-mode=g++, since this was never upstreamed. For backwards compatibility, add a wrapper shell script. Added: stable/10/usr.bin/clang/clang/CC.sh - copied unchanged from r292950, head/usr.bin/clang/clang/CC.sh Deleted: stable/10/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff Modified: stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp stable/10/usr.bin/clang/clang/Makefile Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Added: stable/9/usr.bin/clang/clang/CC.sh - copied unchanged from r292950, head/usr.bin/clang/clang/CC.sh Deleted: stable/9/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff Modified: stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp stable/9/usr.bin/clang/clang/Makefile Directory Properties: stable/9/contrib/llvm/ (props changed) stable/9/contrib/llvm/tools/clang/ (props changed) stable/9/usr.bin/clang/ (props changed) Modified: stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp ============================================================================== --- stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp Tue Jan 12 18:42:00 2016 (r293781) +++ stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp Tue Jan 12 19:33:43 2016 (r293782) @@ -215,14 +215,12 @@ static void ParseProgName(SmallVectorImp } suffixes [] = { { "clang", 0 }, { "clang++", "--driver-mode=g++" }, - { "clang-CC", "--driver-mode=g++" }, { "clang-c++", "--driver-mode=g++" }, { "clang-cc", 0 }, { "clang-cpp", "--driver-mode=cpp" }, { "clang-g++", "--driver-mode=g++" }, { "clang-gcc", 0 }, { "clang-cl", "--driver-mode=cl" }, - { "CC", "--driver-mode=g++" }, { "cc", 0 }, { "cpp", "--driver-mode=cpp" }, { "cl" , "--driver-mode=cl" }, Copied: stable/10/usr.bin/clang/clang/CC.sh (from r292950, head/usr.bin/clang/clang/CC.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/usr.bin/clang/clang/CC.sh Tue Jan 12 19:33:43 2016 (r293782, copy of r292950, head/usr.bin/clang/clang/CC.sh) @@ -0,0 +1,4 @@ +#!/bin/sh +# $FreeBSD$ +# This file is in the public domain. +exec /usr/bin/c++ "$@" Modified: stable/10/usr.bin/clang/clang/Makefile ============================================================================== --- stable/10/usr.bin/clang/clang/Makefile Tue Jan 12 18:42:00 2016 (r293781) +++ stable/10/usr.bin/clang/clang/Makefile Tue Jan 12 19:33:43 2016 (r293782) @@ -18,9 +18,11 @@ LINKS= ${BINDIR}/clang ${BINDIR}/clang++ MLINKS= clang.1 clang++.1 \ clang.1 clang-cpp.1 .if ${MK_CLANG_IS_CC} != "no" +SCRIPTS=CC.sh +SCRIPTSNAME=CC + LINKS+= ${BINDIR}/clang ${BINDIR}/cc \ ${BINDIR}/clang ${BINDIR}/c++ \ - ${BINDIR}/clang ${BINDIR}/CC \ ${BINDIR}/clang ${BINDIR}/cpp MLINKS+= clang.1 cc.1 \ clang.1 c++.1 \