From owner-svn-src-all@freebsd.org  Wed Feb  8 20:31:55 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 68B46CD6544;
 Wed,  8 Feb 2017 20:31:55 +0000 (UTC)
 (envelope-from emaste@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 3697CD3E;
 Wed,  8 Feb 2017 20:31:55 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v18KVsm3051961;
 Wed, 8 Feb 2017 20:31:54 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v18KVsrR051960;
 Wed, 8 Feb 2017 20:31:54 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201702082031.v18KVsrR051960@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 8 Feb 2017 20:31:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r313458 - head/contrib/llvm/tools/lld/ELF
X-SVN-Group: head
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Feb 2017 20:31:55 -0000

Author: emaste
Date: Wed Feb  8 20:31:54 2017
New Revision: 313458
URL: https://svnweb.freebsd.org/changeset/base/313458

Log:
  lld: Allow arbitrary code alignment in .eh_frame
  
  According to the specification, CIE code alignment factor is an
  arbitrary unsigned LEB128 encoded value.
  
  PR:		216908
  Reported by:	Wolfgang Meyer
  Obtained from:	Upstream LLD r277105
  MFC after:	1 week

Modified:
  head/contrib/llvm/tools/lld/ELF/EhFrame.cpp

Modified: head/contrib/llvm/tools/lld/ELF/EhFrame.cpp
==============================================================================
--- head/contrib/llvm/tools/lld/ELF/EhFrame.cpp	Wed Feb  8 20:21:29 2017	(r313457)
+++ head/contrib/llvm/tools/lld/ELF/EhFrame.cpp	Wed Feb  8 20:31:54 2017	(r313458)
@@ -117,9 +117,8 @@ template <class ELFT> uint8_t getFdeEnco
   StringRef Aug(reinterpret_cast<const char *>(D.begin()), AugEnd - D.begin());
   D = D.slice(Aug.size() + 1);
 
-  // Code alignment factor should always be 1 for .eh_frame.
-  if (readByte(D) != 1)
-    fatal("CIE code alignment must be 1");
+  // Skip code alignment factor.
+  skipLeb128(D);
 
   // Skip data alignment factor.
   skipLeb128(D);