Our <machine/asm.h> files were modified from upstream, to the extent that no architecture was actually using the upstream ENTRY or END macros, assuming that architecture even had such a macro upstream. This patch moves everyone to the same macros, with just a few tweaks remaining in the <machine/asm.h> files, which no one should now use directly. I've removed most of the unused cruft from the <machine/asm.h> files, though there's still rather a lot in the mips/mips64 ones. Bug: 12229603 Change-Id: I2fff287dc571ac1087abe9070362fb9420d85d6d
		
			
				
	
	
		
			72 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			72 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*	$NetBSD: asm.h,v 1.40 2011/06/16 13:16:20 joerg Exp $	*/
 | 
						|
 | 
						|
/*-
 | 
						|
 * Copyright (c) 1990 The Regents of the University of California.
 | 
						|
 * All rights reserved.
 | 
						|
 *
 | 
						|
 * This code is derived from software contributed to Berkeley by
 | 
						|
 * William Jolitz.
 | 
						|
 *
 | 
						|
 * 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 the University nor the names of its contributors
 | 
						|
 *    may be used to endorse or promote products derived from this software
 | 
						|
 *    without specific prior written permission.
 | 
						|
 *
 | 
						|
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 THE REGENTS 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.
 | 
						|
 *
 | 
						|
 *	@(#)asm.h	5.5 (Berkeley) 5/7/91
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef _I386_ASM_H_
 | 
						|
#define _I386_ASM_H_
 | 
						|
 | 
						|
#ifdef PIC
 | 
						|
#define PIC_PROLOGUE	\
 | 
						|
	pushl	%ebx;	\
 | 
						|
	call	1f;	\
 | 
						|
1:			\
 | 
						|
	popl	%ebx;	\
 | 
						|
	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx
 | 
						|
#define PIC_EPILOGUE	\
 | 
						|
	popl	%ebx
 | 
						|
#define PIC_PLT(x)	x@PLT
 | 
						|
#define PIC_GOT(x)	x@GOT(%ebx)
 | 
						|
#define PIC_GOTOFF(x)	x@GOTOFF(%ebx)
 | 
						|
#else
 | 
						|
#define PIC_PROLOGUE
 | 
						|
#define PIC_EPILOGUE
 | 
						|
#define PIC_PLT(x)	x
 | 
						|
#define PIC_GOT(x)	x
 | 
						|
#define PIC_GOTOFF(x)	x
 | 
						|
#endif
 | 
						|
 | 
						|
/* let kernels and others override entrypoint alignment */
 | 
						|
#if !defined(_ALIGN_TEXT) && !defined(_KERNEL)
 | 
						|
# ifdef _STANDALONE
 | 
						|
#  define _ALIGN_TEXT .align 1
 | 
						|
# elif defined __ELF__
 | 
						|
#  define _ALIGN_TEXT .align 16
 | 
						|
# else
 | 
						|
#  define _ALIGN_TEXT .align 4
 | 
						|
# endif
 | 
						|
#endif
 | 
						|
 | 
						|
#endif /* !_I386_ASM_H_ */
 |