From owner-svn-src-all@freebsd.org  Tue Dec 29 20:36:12 2015
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 43A19A54B9D;
 Tue, 29 Dec 2015 20:36:12 +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 152D310D6;
 Tue, 29 Dec 2015 20:36:12 +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 tBTKaBEJ069362;
 Tue, 29 Dec 2015 20:36:11 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTKaBPp069361;
 Tue, 29 Dec 2015 20:36:11 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201512292036.tBTKaBPp069361@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: Tue, 29 Dec 2015 20:36:11 +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: r292885 - stable/10/usr.sbin/crunch/crunchide
X-SVN-Group: stable-10
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.20
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: Tue, 29 Dec 2015 20:36:12 -0000

Author: emaste
Date: Tue Dec 29 20:36:11 2015
New Revision: 292885
URL: https://svnweb.freebsd.org/changeset/base/292885

Log:
  crunchide: Restore IA-64 support accidentally lost in r292421 mismerge
  
  Reported by:	ngie

Modified:
  stable/10/usr.sbin/crunch/crunchide/exec_elf32.c

Modified: stable/10/usr.sbin/crunch/crunchide/exec_elf32.c
==============================================================================
--- stable/10/usr.sbin/crunch/crunchide/exec_elf32.c	Tue Dec 29 20:17:40 2015	(r292884)
+++ stable/10/usr.sbin/crunch/crunchide/exec_elf32.c	Tue Dec 29 20:36:11 2015	(r292885)
@@ -183,6 +183,7 @@ ELFNAMEEND(check)(int fd, const char *fn
 #endif
 	case EM_AARCH64: break;
 	case EM_ARM: break;
+	case EM_IA_64: break;
 	case EM_MIPS: break;
 	case /* EM_MIPS_RS3_LE */ EM_MIPS_RS4_BE: break;
 	case EM_PPC: break;