Remove unused macroes.

Add user, btrap, etrap, bintr and eintrt in the GPROF case.

1 files changed, 15 insertions, 31 deletions

diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S
index 9f8a1f2..c2eca41 100644
--- a/sys/arm/arm/support.S
+++ b/sys/arm/arm/support.S
@@ -33,37 +33,6 @@ __FBSDID("$FreeBSD$");
 ENTRY(casuptr)
 	mov	r1, r2
 	bl	suword
-/*
- * New experimental definitions of IRQdisable and IRQenable
- * These keep FIQ's enabled since FIQ's are special.
- */
-
-#define IRQdisable \
-	mrs	r14, cpsr ; \
-	orr	r14, r14, #(I32_bit) ; \
-	msr	cpsr_c, r14 ; \
-
-#define IRQenable \
-	mrs	r14, cpsr ; \
-	bic	r14, r14, #(I32_bit) ; \
-	msr	cpsr_c, r14 ; \
-
-/*
- * These are used for switching the translation table/DACR.
- * Since the vector page can be invalid for a short time, we must
- * disable both regular IRQs *and* FIQs.
- *
- * XXX: This is not necessary if the vector table is relocated.
- */
-#define IRQdisableALL \
-	mrs	r14, cpsr ; \
-	orr	r14, r14, #(I32_bit) ; \
-	msr	cpsr_all, r14
-
-#define IRQenableALL \
-	mrs	r14, cpsr ; \
-	bic	r14, r14, #(I32_bit) ; \
-	msr	cpsr_all, r14
 
 /*
  * memset: Sets a block of memory to the specified value
@@ -2285,3 +2254,18 @@ ENTRY(memcpy)
 	strb	r1, [r0, #0x0b]
 	mov	pc, lr
 #endif /* __XSCALE__ */
+
+#ifdef GPROF
+
+ENTRY(user)
+	nop
+ENTRY(btrap)
+	nop
+ENTRY(etrap)
+	nop
+ENTRY(bintr)
+	nop
+ENTRY(eintr)
+	nop
+
+#endif