From owner-svn-src-projects@FreeBSD.ORG Thu Dec 25 23:54:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5A99E2A; Thu, 25 Dec 2014 23:54:58 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A1D8B29A4; Thu, 25 Dec 2014 23:54:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBPNsw7s027155; Thu, 25 Dec 2014 23:54:58 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBPNswSo027154; Thu, 25 Dec 2014 23:54:58 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412252354.sBPNswSo027154@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 25 Dec 2014 23:54:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276222 - projects/clang350-import/contrib/llvm/lib/Object X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Dec 2014 23:54:58 -0000 Author: dim Date: Thu Dec 25 23:54:57 2014 New Revision: 276222 URL: https://svnweb.freebsd.org/changeset/base/276222 Log: Amend r276211 for the new PowerPC relocation types that were added there. (Upstream is now using a generated file for this, so there is no direct upstream commit associated with this change.) Modified: projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp Modified: projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp Thu Dec 25 22:29:37 2014 (r276221) +++ projects/clang350-import/contrib/llvm/lib/Object/ELF.cpp Thu Dec 25 23:54:57 2014 (r276222) @@ -531,6 +531,8 @@ StringRef getELFRelocationTypeName(uint3 LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_HI); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_HA); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_PLTREL24); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_JMP_SLOT); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_LOCAL24PC); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_REL32); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_TLS); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_DTPMOD32); @@ -590,6 +592,7 @@ StringRef getELFRelocationTypeName(uint3 LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_GOT16_LO); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_GOT16_HI); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_GOT16_HA); + LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_JMP_SLOT); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_REL32); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_ADDR64); LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC64_ADDR16_HIGHER);