Index: head/sys/arm/arm/cpufunc_asm_armv5_ec.S
===================================================================
--- head/sys/arm/arm/cpufunc_asm_armv5_ec.S	(revision 336828)
+++ head/sys/arm/arm/cpufunc_asm_armv5_ec.S	(revision 336829)
@@ -1,214 +1,217 @@
 /*	$NetBSD: cpufunc_asm_armv5_ec.S,v 1.1 2007/01/06 00:50:54 christos Exp $	*/
 
 /*
  * Copyright (c) 2002, 2005 ARM Limited
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the company may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * ARMv5 assembly functions for manipulating caches.
  * These routines can be used by any core that supports both the set/index
  * operations and the test and clean operations for efficiently cleaning the
  * entire DCache.  If a core does not have the test and clean operations, but
  * does have the set/index operations, use the routines in cpufunc_asm_armv5.S.
  * This source was derived from that file.
  */
 
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
+#ifndef ELF_TRAMPOLINE
 /*
  * Functions to set the MMU Translation Table Base register
  *
  * We need to clean and flush the cache as it uses virtual
  * addresses that are about to change.
  */
 ENTRY(armv5_ec_setttb)
 	/*
 	 * Some other ARM ports save registers on the stack, call the
 	 * idcache_wbinv_all function and then restore the registers from the
 	 * stack before setting the TTB.  I observed that this caused a
 	 * problem when the old and new translation table entries' buffering
 	 * bits were different.  If I saved the registers in other registers
 	 * or invalidated the caches when I returned from idcache_wbinv_all,
 	 * it worked fine.  If not, I ended up executing at an invalid PC.
 	 * For armv5_ec_settb, the idcache_wbinv_all is simple enough, I just
 	 * do it directly and entirely avoid the problem.
 	 */
 	mcr	p15, 0, r0, c7, c5, 0	/* Invalidate ICache */
 1:	mrc	p15, 0, APSR_nzcv, c7, c14, 3	/* Test, clean and invalidate DCache */
 	bne	1b			/* More to do? */
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 
 	mcr	p15, 0, r0, c2, c0, 0	/* load new TTB */
 
 	mcr	p15, 0, r0, c8, c7, 0	/* invalidate I+D TLBs */
 	RET
 END(armv5_ec_setttb)
 
 /*
  * Cache operations.  For the entire cache we use the enhanced cache
  * operations.
  */
 
 ENTRY_NP(armv5_ec_icache_sync_range)
 	ldr	ip, .Larmv5_ec_line_size
 	cmp	r1, #0x4000
 	bcs	.Larmv5_ec_icache_sync_all
 	ldr	ip, [ip]
 	sub	r1, r1, #1		/* Don't overrun */
 	sub	r3, ip, #1
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
 1:
 	mcr	p15, 0, r0, c7, c5, 1	/* Invalidate I cache SE with VA */
 	mcr	p15, 0, r0, c7, c10, 1	/* Clean D cache SE with VA */
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bpl	1b
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
 
 .Larmv5_ec_icache_sync_all:
 	/*
 	 * We assume that the code here can never be out of sync with the
 	 * dcache, so that we can safely flush the Icache and fall through
 	 * into the Dcache cleaning code.
 	 */
 	mcr	p15, 0, r0, c7, c5, 0	/* Flush I cache */
 	/* Fall through to clean Dcache. */
 
 .Larmv5_ec_dcache_wb:
 1:
 	mrc	p15, 0, APSR_nzcv, c7, c10, 3	/* Test and clean (don't invalidate) */
 	bne	1b			/* More to do? */
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
 END(armv5_ec_icache_sync_range)
 
 .Larmv5_ec_line_size:
 	.word	_C_LABEL(arm_pdcache_line_size)
 
 ENTRY(armv5_ec_dcache_wb_range)
 	ldr	ip, .Larmv5_ec_line_size
 	cmp	r1, #0x4000
 	bcs	.Larmv5_ec_dcache_wb
 	ldr	ip, [ip]
 	sub	r1, r1, #1		/* Don't overrun */
 	sub	r3, ip, #1
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
 1:
 	mcr	p15, 0, r0, c7, c10, 1	/* Clean D cache SE with VA */
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bpl	1b
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
 END(armv5_ec_dcache_wb_range)
 
 ENTRY(armv5_ec_dcache_wbinv_range)
 	ldr	ip, .Larmv5_ec_line_size
 	cmp	r1, #0x4000
 	bcs	.Larmv5_ec_dcache_wbinv_all
 	ldr	ip, [ip]
 	sub	r1, r1, #1		/* Don't overrun */
 	sub	r3, ip, #1
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
 1:
 	mcr	p15, 0, r0, c7, c14, 1	/* Purge D cache SE with VA */
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bpl	1b
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
 END(armv5_ec_dcache_wbinv_range)
 
 /*
  * Note, we must not invalidate everything.  If the range is too big we
  * must use wb-inv of the entire cache.
  */
 ENTRY(armv5_ec_dcache_inv_range)
 	ldr	ip, .Larmv5_ec_line_size
 	cmp	r1, #0x4000
 	bcs	.Larmv5_ec_dcache_wbinv_all
 	ldr	ip, [ip]
 	sub	r1, r1, #1		/* Don't overrun */
 	sub	r3, ip, #1
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
 1:
 	mcr	p15, 0, r0, c7, c6, 1	/* Invalidate D cache SE with VA */
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bpl	1b
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
 END(armv5_ec_dcache_inv_range)
 
 ENTRY(armv5_ec_idcache_wbinv_range)
 	ldr	ip, .Larmv5_ec_line_size
 	cmp	r1, #0x4000
 	bcs	.Larmv5_ec_idcache_wbinv_all
 	ldr	ip, [ip]
 	sub	r1, r1, #1		/* Don't overrun */
 	sub	r3, ip, #1
 	and	r2, r0, r3
 	add	r1, r1, r2
 	bic	r0, r0, r3
 1:
 	mcr	p15, 0, r0, c7, c5, 1	/* Invalidate I cache SE with VA */
 	mcr	p15, 0, r0, c7, c14, 1	/* Purge D cache SE with VA */
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bpl	1b
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
 END(armv5_ec_idcache_wbinv_range)
+#endif /* !ELF_TRAMPOLINE */
 
 ENTRY_NP(armv5_ec_idcache_wbinv_all)
 .Larmv5_ec_idcache_wbinv_all:
 	/*
 	 * We assume that the code here can never be out of sync with the
 	 * dcache, so that we can safely flush the Icache and fall through
 	 * into the Dcache purging code.
 	 */
 	mcr	p15, 0, r0, c7, c5, 0	/* Invalidate ICache */
 	/* Fall through to purge Dcache. */
 END(armv5_ec_idcache_wbinv_all)
 
+#ifndef ELF_TRAMPOLINE
 ENTRY(armv5_ec_dcache_wbinv_all)
 .Larmv5_ec_dcache_wbinv_all:
 1:	mrc	p15, 0, APSR_nzcv, c7, c14, 3	/* Test, clean and invalidate DCache */
 	bne	1b			/* More to do? */
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
 END(armv5_ec_dcache_wbinv_all)
-
+#endif
Index: head/sys/arm/arm/cpufunc_asm_sheeva.S
===================================================================
--- head/sys/arm/arm/cpufunc_asm_sheeva.S	(revision 336828)
+++ head/sys/arm/arm/cpufunc_asm_sheeva.S	(revision 336829)
@@ -1,421 +1,424 @@
 /*-
  * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
  * All rights reserved.
  *
  * Developed by Semihalf.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of MARVELL nor the names of contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 #include <machine/armreg.h>
 #include <machine/param.h>
 
+#ifndef ELF_TRAMPOLINE
 .Lsheeva_cache_line_size:
 	.word	_C_LABEL(arm_pdcache_line_size)
 .Lsheeva_asm_page_mask:
 	.word	_C_LABEL(PAGE_MASK)
 
 ENTRY(sheeva_setttb)
 	/* Disable irqs */
 	mrs	r2, cpsr
 	orr	r3, r2, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 
 	mov	r1, #0
 	mcr	p15, 0, r1, c7, c5, 0	/* Invalidate ICache */
 1:	mrc	p15, 0, APSR_nzcv, c7, c14, 3	/* Test, clean and invalidate DCache */
 	bne	1b			/* More to do? */
 
 	mcr	p15, 1, r1, c15, c9, 0	/* Clean L2 */
 	mcr	p15, 1, r1, c15, c11, 0	/* Invalidate L2 */
 
 	/* Reenable irqs */
 	msr	cpsr_c, r2
 
 	mcr	p15, 0, r1, c7, c10, 4	/* drain the write buffer */
 
 	mcr	p15, 0, r0, c2, c0, 0	/* load new TTB */
 
 	mcr	p15, 0, r0, c8, c7, 0	/* invalidate I+D TLBs */
 	RET
 END(sheeva_setttb)
 
 ENTRY(sheeva_dcache_wbinv_range)
 	str	lr, [sp, #-4]!
 	mrs	lr, cpsr
 	/* Start with cache line aligned address */
 	ldr	ip, .Lsheeva_cache_line_size
 	ldr	ip, [ip]
 	sub	ip, ip, #1
 	and	r2, r0, ip
 	add	r1, r1, r2
 	add	r1, r1, ip
 	bics	r1, r1, ip
 	bics	r0, r0, ip
 
 	ldr	ip, .Lsheeva_asm_page_mask
 	and	r2, r0, ip
 	rsb	r2, r2, #PAGE_SIZE
 	cmp	r1, r2
 	movcc	ip, r1
 	movcs	ip, r2
 1:
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
 	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 5, r0, c15, c15, 0	/* Clean and inv zone start address */
 	mcr	p15, 5, r2, c15, c15, 1	/* Clean and inv zone end address */
 	/* Enable irqs */
 	msr	cpsr_c, lr
 
 	add	r0, r0, ip
 	sub	r1, r1, ip
 	cmp	r1, #PAGE_SIZE
 	movcc	ip, r1
 	movcs	ip, #PAGE_SIZE
 	cmp	r1, #0
 	bne	1b
 	mov	r0, #0
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	ldr	lr, [sp], #4
 	RET
 END(sheeva_dcache_wbinv_range)
 
 ENTRY(sheeva_idcache_wbinv_range)
 	str	lr, [sp, #-4]!
 	mrs	lr, cpsr
 	/* Start with cache line aligned address */
 	ldr	ip, .Lsheeva_cache_line_size
 	ldr	ip, [ip]
 	sub	ip, ip, #1
 	and	r2, r0, ip
 	add	r1, r1, r2
 	add	r1, r1, ip
 	bics	r1, r1, ip
 	bics	r0, r0, ip
 
 	ldr	ip, .Lsheeva_asm_page_mask
 	and	r2, r0, ip
 	rsb	r2, r2, #PAGE_SIZE
 	cmp	r1, r2
 	movcc	ip, r1
 	movcs	ip, r2
 1:
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
 	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 5, r0, c15, c15, 0	/* Clean and inv zone start address */
 	mcr	p15, 5, r2, c15, c15, 1	/* Clean and inv zone end address */
 	/* Enable irqs */
 	msr	cpsr_c, lr
 
 	/* Invalidate and clean icache line by line */
 	ldr	r3, .Lsheeva_cache_line_size
 	ldr	r3, [r3]
 2:
 	mcr	p15, 0, r0, c7, c5, 1
 	add	r0, r0, r3
 	cmp	r2, r0
 	bhi	2b
 
 	add	r0, r2, #1
 	sub	r1, r1, ip
 	cmp	r1, #PAGE_SIZE
 	movcc	ip, r1
 	movcs	ip, #PAGE_SIZE
 	cmp	r1, #0
 	bne	1b
 	mov	r0, #0
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	ldr	lr, [sp], #4
 	RET
 END(sheeva_idcache_wbinv_range)
 
 ENTRY(sheeva_dcache_inv_range)
 	str	lr, [sp, #-4]!
 	mrs	lr, cpsr
 	/* Start with cache line aligned address */
 	ldr	ip, .Lsheeva_cache_line_size
 	ldr	ip, [ip]
 	sub	ip, ip, #1
 	and	r2, r0, ip
 	add	r1, r1, r2
 	add	r1, r1, ip
 	bics	r1, r1, ip
 	bics	r0, r0, ip
 
 	ldr	ip, .Lsheeva_asm_page_mask
 	and	r2, r0, ip
 	rsb	r2, r2, #PAGE_SIZE
 	cmp	r1, r2
 	movcc	ip, r1
 	movcs	ip, r2
 1:
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
 	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 5, r0, c15, c14, 0	/* Inv zone start address */
 	mcr	p15, 5, r2, c15, c14, 1	/* Inv zone end address */
 	/* Enable irqs */
 	msr	cpsr_c, lr
 
 	add	r0, r0, ip
 	sub	r1, r1, ip
 	cmp	r1, #PAGE_SIZE
 	movcc	ip, r1
 	movcs	ip, #PAGE_SIZE
 	cmp	r1, #0
 	bne	1b
 	mov	r0, #0
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	ldr	lr, [sp], #4
 	RET
 END(sheeva_dcache_inv_range)
 
 ENTRY(sheeva_dcache_wb_range)
 	str	lr, [sp, #-4]!
 	mrs	lr, cpsr
 	/* Start with cache line aligned address */
 	ldr	ip, .Lsheeva_cache_line_size
 	ldr	ip, [ip]
 	sub	ip, ip, #1
 	and	r2, r0, ip
 	add	r1, r1, r2
 	add	r1, r1, ip
 	bics	r1, r1, ip
 	bics	r0, r0, ip
 
 	ldr	ip, .Lsheeva_asm_page_mask
 	and	r2, r0, ip
 	rsb	r2, r2, #PAGE_SIZE
 	cmp	r1, r2
 	movcc	ip, r1
 	movcs	ip, r2
 1:
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
 	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 5, r0, c15, c13, 0	/* Clean zone start address */
 	mcr	p15, 5, r2, c15, c13, 1	/* Clean zone end address */
 	/* Enable irqs */
 	msr	cpsr_c, lr
 
 	add	r0, r0, ip
 	sub	r1, r1, ip
 	cmp	r1, #PAGE_SIZE
 	movcc	ip, r1
 	movcs	ip, #PAGE_SIZE
 	cmp	r1, #0
 	bne	1b
 	mov	r0, #0
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	ldr	lr, [sp], #4
 	RET
 END(sheeva_dcache_wb_range)
 
 ENTRY(sheeva_l2cache_wbinv_range)
 	str	lr, [sp, #-4]!
 	mrs	lr, cpsr
 	/* Start with cache line aligned address */
 	ldr	ip, .Lsheeva_cache_line_size
 	ldr	ip, [ip]
 	sub	ip, ip, #1
 	and	r2, r0, ip
 	add	r1, r1, r2
 	add	r1, r1, ip
 	bics	r1, r1, ip
 	bics	r0, r0, ip
 
 	ldr	ip, .Lsheeva_asm_page_mask
 	and	r2, r0, ip
 	rsb	r2, r2, #PAGE_SIZE
 	cmp	r1, r2
 	movcc	ip, r1
 	movcs	ip, r2
 1:
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
 	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 1, r0, c15, c9, 4	/* Clean L2 zone start address */
 	mcr	p15, 1, r2, c15, c9, 5	/* Clean L2 zone end address */
 	mcr	p15, 1, r0, c15, c11, 4	/* Inv L2 zone start address */
 	mcr	p15, 1, r2, c15, c11, 5	/* Inv L2 zone end address */
 	/* Enable irqs */
 	msr	cpsr_c, lr
 
 	add	r0, r0, ip
 	sub	r1, r1, ip
 	cmp	r1, #PAGE_SIZE
 	movcc	ip, r1
 	movcs	ip, #PAGE_SIZE
 	cmp	r1, #0
 	bne	1b
 	mov	r0, #0
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	ldr	lr, [sp], #4
 	RET
 END(sheeva_l2cache_wbinv_range)
 
 ENTRY(sheeva_l2cache_inv_range)
 	str	lr, [sp, #-4]!
 	mrs	lr, cpsr
 	/* Start with cache line aligned address */
 	ldr	ip, .Lsheeva_cache_line_size
 	ldr	ip, [ip]
 	sub	ip, ip, #1
 	and	r2, r0, ip
 	add	r1, r1, r2
 	add	r1, r1, ip
 	bics	r1, r1, ip
 	bics	r0, r0, ip
 
 	ldr	ip, .Lsheeva_asm_page_mask
 	and	r2, r0, ip
 	rsb	r2, r2, #PAGE_SIZE
 	cmp	r1, r2
 	movcc	ip, r1
 	movcs	ip, r2
 1:
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
 	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 1, r0, c15, c11, 4	/* Inv L2 zone start address */
 	mcr	p15, 1, r2, c15, c11, 5	/* Inv L2 zone end address */
 	/* Enable irqs */
 	msr	cpsr_c, lr
 
 	add	r0, r0, ip
 	sub	r1, r1, ip
 	cmp	r1, #PAGE_SIZE
 	movcc	ip, r1
 	movcs	ip, #PAGE_SIZE
 	cmp	r1, #0
 	bne	1b
 	mov	r0, #0
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	ldr	lr, [sp], #4
 	RET
 END(sheeva_l2cache_inv_range)
 
 ENTRY(sheeva_l2cache_wb_range)
 	str	lr, [sp, #-4]!
 	mrs	lr, cpsr
 	/* Start with cache line aligned address */
 	ldr	ip, .Lsheeva_cache_line_size
 	ldr	ip, [ip]
 	sub	ip, ip, #1
 	and	r2, r0, ip
 	add	r1, r1, r2
 	add	r1, r1, ip
 	bics	r1, r1, ip
 	bics	r0, r0, ip
 
 	ldr	ip, .Lsheeva_asm_page_mask
 	and	r2, r0,	ip
 	rsb	r2, r2, #PAGE_SIZE
 	cmp	r1, r2
 	movcc	ip, r1
 	movcs	ip, r2
 1:
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
 	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 1, r0, c15, c9, 4	/* Clean L2 zone start address */
 	mcr	p15, 1, r2, c15, c9, 5	/* Clean L2 zone end address */
 	/* Enable irqs */
 	msr	cpsr_c, lr
 
 	add	r0, r0, ip
 	sub	r1, r1, ip
 	cmp	r1, #PAGE_SIZE
 	movcc	ip, r1
 	movcs	ip, #PAGE_SIZE
 	cmp	r1, #0
 	bne	1b
 	mov	r0, #0
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	ldr	lr, [sp], #4
 	RET
 END(sheeva_l2cache_wb_range)
+#endif /* !ELF_TRAMPOLINE */
 
 ENTRY(sheeva_l2cache_wbinv_all)
 	/* Disable irqs */
 	mrs	r1, cpsr
 	orr	r2, r1, #PSR_I | PSR_F
 	msr	cpsr_c, r2
 
 	mov	r0, #0
 	mcr	p15, 1, r0, c15, c9, 0	/* Clean L2 */
 	mcr	p15, 1, r0, c15, c11, 0	/* Invalidate L2 */
 
 	msr	cpsr_c, r1		/* Reenable irqs */
 
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
 END(sheeva_l2cache_wbinv_all)
 
+#ifndef ELF_TRAMPOLINE
 /* This function modifies register value as follows:
  *
  * arg1  arg		EFFECT (bit value saved into register)
  *    0     0           not changed
  *    0     1           negated
  *    1     0           cleared
  *    1     1           set
  */
 ENTRY(sheeva_control_ext)
 	mrc	p15, 1, r3, c15, c1, 0	/* Read the control register */
 	bic	r2, r3, r0		/* Clear bits */
 	eor     r2, r2, r1		/* XOR bits */
 
 	teq	r2, r3			/* Only write if there is a change */
 	mcrne	p15, 1, r2, c15, c1, 0	/* Write new control register */
 	mov	r0, r3			/* Return old value */
 	RET
 END(sheeva_control_ext)
 
 ENTRY(sheeva_cpu_sleep)
 	mov	r0, #0
 	mcr	p15, 0, r0, c7, c10, 4	/* Drain write buffer */
 	mcr	p15, 0, r0, c7, c0, 4	/* Wait for interrupt */
 	mov	pc, lr
 END(sheeva_cpu_sleep)
-
+#endif /* !ELF_TRAMPOLINE */
Index: head/sys/conf/Makefile.arm
===================================================================
--- head/sys/conf/Makefile.arm	(revision 336828)
+++ head/sys/conf/Makefile.arm	(revision 336829)
@@ -1,173 +1,171 @@
 # Makefile.arm -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arm/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.arm
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
 %VERSREQ=	600013
 
 STD8X16FONT?=	iso
 
 .if !defined(S)
 .if exists(./@/.)
 S=	./@
 .else
 S=	../../..
 .endif
 .endif
 .include "$S/conf/kern.pre.mk"
 
 INCLUDES+= -I$S/contrib/libfdt -I$S/gnu/dts/include 
 
 SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M}
 SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M}
 
 .if !defined(DEBUG) && !defined(PROFLEVEL)
 STRIP_FLAGS = -S
 .endif
 
 # We don't support gcc's thump interwork stuff, so disable it
 CFLAGS.gcc += -mno-thumb-interwork
 
 # We generally don't want fpu instructions in the kernel.
 CFLAGS.clang += -mfpu=none
 
 .if !empty(DDB_ENABLED)
 CFLAGS += -funwind-tables
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30500
 # clang < 3.5.0 requires us to tell it to emit assembly with unwind information
 CFLAGS += -mllvm -arm-enable-ehabi
 .endif
 .endif
 
 # "makeoptions KERNVIRTADDR=" is now optional, supply the default value.
 .if empty(KERNVIRTADDR)
 KERNVIRTADDR= 0xc0000000
 .endif
 
 # hack because genassym.c includes sys/bus.h which includes these.
 genassym.o: bus_if.h device_if.h
 
 SYSTEM_LD_ = ${LD} -m ${LD_EMULATION} -Bdynamic -T ldscript.$M.noheader \
 	${_LDFLAGS} --no-warn-mismatch --warn-common --export-dynamic \
 	--dynamic-linker /red/herring \
 	-o ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript.$M\
 		>ldscript.$M.noheader; \
 		${SYSTEM_LD_}; \
 		${OBJCOPY} -S -O binary ${FULLKERNEL}.noheader \
 		${KERNEL_KO}.bin; \
 		rm ${FULLKERNEL}.noheader
 
 FILES_CPU_FUNC = \
-	$S/$M/$M/cpufunc_asm_arm9.S \
-	$S/$M/$M/cpufunc_asm.S \
 	$S/$M/$M/cpufunc_asm_armv5_ec.S \
 	$S/$M/$M/cpufunc_asm_sheeva.S
 
 .if ${MACHINE_ARCH:Marmv[67]*} == "" && defined(KERNPHYSADDR)
 KERNEL_EXTRA=trampoline
 KERNEL_EXTRA_INSTALL=kernel.gz.tramp
 trampoline: ${KERNEL_KO}.tramp
 ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c
 	echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h 
 	sed s/${KERNVIRTADDR}/${KERNPHYSADDR}/ ldscript.$M > ldscript.$M.tramp
 	sed s/" + SIZEOF_HEADERS"// ldscript.$M.tramp > \
 	    ldscript.$M.tramp.noheader
 	echo "#include <machine/asm.h>" >tmphack.S
 	echo "ENTRY(_start)" >>tmphack.S
 	echo "bl _startC" >>tmphack.S
 	${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \
 	    -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp
 	eval $$(stat -s ${KERNEL_KO}.tmp) && \
 	    echo "#define KERNSIZE $$st_size" >>opt_kernname.h
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp \
 	    -DELF_TRAMPOLINE \
 	    tmphack.S \
 	    $S/$M/$M/elf_trampoline.c \
 	    $S/$M/$M/inckern.S \
 	    ${FILES_CPU_FUNC} \
 	    -o ${KERNEL_KO}.tramp
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \
 	    -DELF_TRAMPOLINE \
 	    tmphack.S \
 	    $S/$M/$M/elf_trampoline.c \
 	    $S/$M/$M/inckern.S \
 	    ${FILES_CPU_FUNC} \
 	    -o ${KERNEL_KO}.tramp.noheader 
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
 	    ${KERNEL_KO}.tramp.bin 
 	${OBJCOPY} ${STRIP_FLAGS} ${KERNEL_KO}.tmp 
 	echo "#define KERNNAME \"${KERNEL_KO}.tmp.gz\"" >opt_kernname.h 
 	eval $$(stat -s ${KERNEL_KO}.tmp) && \
 	    echo "#define KERNSIZE $$st_size" >>opt_kernname.h
 	gzip -f9 ${KERNEL_KO}.tmp
 	eval $$(stat -s ${KERNEL_KO}.tmp.gz) && \
 	    echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h
 	${CC} -O2 -ffreestanding -I. -I$S -c \
 	    -DKZIP -DELF_TRAMPOLINE \
 	    $S/kern/subr_inflate.c \
 	    -o inflate-tramp.o
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp \
 	    -DKZIP -DELF_TRAMPOLINE \
 	    tmphack.S \
 	    $S/$M/$M/elf_trampoline.c \
 	    inflate-tramp.o \
 	    $S/$M/$M/inckern.S \
 	    ${FILES_CPU_FUNC} \
 	    -o ${KERNEL_KO}.gz.tramp
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \
 	    -DKZIP -DELF_TRAMPOLINE \
 	    tmphack.S \
 	    $S/$M/$M/elf_trampoline.c \
 	    inflate-tramp.o \
 	    $S/$M/$M/inckern.S \
 	    ${FILES_CPU_FUNC} \
 	    -o ${KERNEL_KO}.tramp.noheader
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
 	    ${KERNEL_KO}.gz.tramp.bin
 	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
 	    inflate-tramp.o tmphack.S
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 CLEAN+=	ldscript.$M ${KERNEL_KO}.bin ldscript.$M.noheader
 
 CLEAN+= ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp.bin ldscript.$M.tramp \
 	ldscript.$M.tramp.noheader ${KERNEL_KO}.gz.tramp \
 	${KERNEL_KO}.gz.tramp.bin
 
 ldscript.$M: $S/conf/ldscript.$M
 	cat $S/conf/ldscript.$M|sed s/KERNPHYSADDR/${KERNPHYSADDR}/g| \
 	  sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M
 %RULES
 	
 .include "$S/conf/kern.post.mk"