From owner-svn-src-head@FreeBSD.ORG  Wed Sep 11 06:42:56 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTP id 37246BCB;
 Wed, 11 Sep 2013 06:42:56 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
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 251812847;
 Wed, 11 Sep 2013 06:42:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8B6guBR019538;
 Wed, 11 Sep 2013 06:42:56 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8B6gtTq019537;
 Wed, 11 Sep 2013 06:42:55 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201309110642.r8B6gtTq019537@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 11 Sep 2013 06:42:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255468 - head/usr.sbin/pkg
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Sep 2013 06:42:56 -0000

Author: bapt
Date: Wed Sep 11 06:42:55 2013
New Revision: 255468
URL: http://svnweb.freebsd.org/changeset/base/255468

Log:
  Cleanup elf macros
  
  Only define EF_MIPS_ABI when not already supplied
  Remove old now unused ARM macros
  
  Reported by:	imp
  Approved by:	re (kib)

Modified:
  head/usr.sbin/pkg/elf_tables.h

Modified: head/usr.sbin/pkg/elf_tables.h
==============================================================================
--- head/usr.sbin/pkg/elf_tables.h	Wed Sep 11 06:41:15 2013	(r255467)
+++ head/usr.sbin/pkg/elf_tables.h	Wed Sep 11 06:42:55 2013	(r255468)
@@ -58,16 +58,12 @@ static struct _elf_corres endian_corres[
 	{ -1, NULL}
 };
 
-#define EF_MIPS_ABI	0x0000F000
+#ifndef EF_MIPS_ABI
+#define EF_MIPS_ABI	0x0000f000
+#endif
 #define E_MIPS_ABI_O32	0x00001000
 #define E_MIPS_ABI_N32	0x00000020
 
-#define EF_ARM_NEW_ABI	0x80
-#define EF_ARM_OLD_ABI	0x100
-
-#define EF_ARM_SOFT_FLOAT	0x200
-#define EF_ARM_VFP_FLOAT	0x400
-
 #define NT_VERSION	1
 #define NT_ARCH	2