From owner-svn-src-all@FreeBSD.ORG Thu Dec 12 22:01:43 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11DB0BCC; Thu, 12 Dec 2013 22:01:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F10071D5A; Thu, 12 Dec 2013 22:01:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBCM1gup004600; Thu, 12 Dec 2013 22:01:42 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBCM1grq004599; Thu, 12 Dec 2013 22:01:42 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201312122201.rBCM1grq004599@svn.freebsd.org> From: Dimitry Andric Date: Thu, 12 Dec 2013 22:01:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259278 - releng/10.0/contrib/llvm/tools/clang/lib/CodeGen X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2013 22:01:43 -0000 Author: dim Date: Thu Dec 12 22:01:42 2013 New Revision: 259278 URL: http://svnweb.freebsd.org/changeset/base/259278 Log: Merge r259214 from stable/10 (head r259100): Pull in r196658 from upstream clang trunk: CodeGen: Don't emit linkage on thunks that aren't emitted because they're vararg. This can happen when we're trying to emit a thunk with available_externally linkage with optimization enabled but bail because it doesn't make sense for vararg functions. [LLVM] PR18098. This should fix clang "Broken module found, compilation aborted" errors when building the qt4-based dvbcut port. Reported by: se Approved by: re (glebius) Modified: releng/10.0/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp ============================================================================== --- releng/10.0/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp Thu Dec 12 21:51:33 2013 (r259277) +++ releng/10.0/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp Thu Dec 12 22:01:42 2013 (r259278) @@ -454,10 +454,9 @@ void CodeGenVTables::EmitThunk(GlobalDec } else { // Normal thunk body generation. CodeGenFunction(CGM).GenerateThunk(ThunkFn, FnInfo, GD, Thunk); + if (UseAvailableExternallyLinkage) + ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage); } - - if (UseAvailableExternallyLinkage) - ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage); } void CodeGenVTables::MaybeEmitThunkAvailableExternally(GlobalDecl GD,