From ad59bd68ad3874b045eebf341601ea418466cd7b Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 11 Sep 2013 06:42:55 +0000
Subject: [PATCH] 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)
---
 usr.sbin/pkg/elf_tables.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/pkg/elf_tables.h b/usr.sbin/pkg/elf_tables.h
index d3d689a99dc..0589ecf9425 100644
--- a/usr.sbin/pkg/elf_tables.h
+++ b/usr.sbin/pkg/elf_tables.h
@@ -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