All of the m68k ports' exec.h's were essentially the same. Merge them.
Override the N_PAGSIZ() macro; this one checks the MID of the executable and returns the appropriate page size.
This commit is contained in:
parent
9110bcca3a
commit
c5e5dec3b7
|
@ -0,0 +1,59 @@
|
||||||
|
/* $NetBSD: aout_machdep.h,v 1.1 1996/09/08 00:57:29 thorpej Exp $ */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 1993 Christopher G. Demetriou
|
||||||
|
* 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 author 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 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _M68K_EXEC_H_
|
||||||
|
#define _M68K_EXEC_H_
|
||||||
|
|
||||||
|
#ifndef __LDPGSZ /* XXX */
|
||||||
|
#define __LDPGSZ 8192
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Override the N_PAGSIZ() macro.
|
||||||
|
* XXX Nicer way to do this?
|
||||||
|
*/
|
||||||
|
#undef N_PAGSIZ
|
||||||
|
#define N_PAGSIZ(ex) (N_GETMID((ex)) == MID_M68K ? 8192 : \
|
||||||
|
(N_GETMID((ex)) == MID_M68K4K ? 4096 : __LDPGSZ))
|
||||||
|
|
||||||
|
/* Relocation format. */
|
||||||
|
struct relocation_info_m68k {
|
||||||
|
int r_address; /* offset in text or data segment */
|
||||||
|
unsigned int r_symbolnum : 24, /* ordinal number of add symbol */
|
||||||
|
r_pcrel : 1, /* 1 if value should be pc-relative */
|
||||||
|
r_length : 2, /* log base 2 of value's width */
|
||||||
|
r_extern : 1, /* 1 if need to add symbol to value */
|
||||||
|
r_baserel : 1, /* linkage table relative */
|
||||||
|
r_jmptable : 1, /* relocate to jump table */
|
||||||
|
r_relative : 1, /* load address relative */
|
||||||
|
r_copy : 1; /* run time copy */
|
||||||
|
};
|
||||||
|
#define relocation_info relocation_info_m68k
|
||||||
|
|
||||||
|
#endif /* _M68K_EXEC_H_ */
|
|
@ -0,0 +1,59 @@
|
||||||
|
/* $NetBSD: exec.h,v 1.1 1996/09/08 00:57:29 thorpej Exp $ */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 1993 Christopher G. Demetriou
|
||||||
|
* 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 author 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 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _M68K_EXEC_H_
|
||||||
|
#define _M68K_EXEC_H_
|
||||||
|
|
||||||
|
#ifndef __LDPGSZ /* XXX */
|
||||||
|
#define __LDPGSZ 8192
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Override the N_PAGSIZ() macro.
|
||||||
|
* XXX Nicer way to do this?
|
||||||
|
*/
|
||||||
|
#undef N_PAGSIZ
|
||||||
|
#define N_PAGSIZ(ex) (N_GETMID((ex)) == MID_M68K ? 8192 : \
|
||||||
|
(N_GETMID((ex)) == MID_M68K4K ? 4096 : __LDPGSZ))
|
||||||
|
|
||||||
|
/* Relocation format. */
|
||||||
|
struct relocation_info_m68k {
|
||||||
|
int r_address; /* offset in text or data segment */
|
||||||
|
unsigned int r_symbolnum : 24, /* ordinal number of add symbol */
|
||||||
|
r_pcrel : 1, /* 1 if value should be pc-relative */
|
||||||
|
r_length : 2, /* log base 2 of value's width */
|
||||||
|
r_extern : 1, /* 1 if need to add symbol to value */
|
||||||
|
r_baserel : 1, /* linkage table relative */
|
||||||
|
r_jmptable : 1, /* relocate to jump table */
|
||||||
|
r_relative : 1, /* load address relative */
|
||||||
|
r_copy : 1; /* run time copy */
|
||||||
|
};
|
||||||
|
#define relocation_info relocation_info_m68k
|
||||||
|
|
||||||
|
#endif /* _M68K_EXEC_H_ */
|
Loading…
Reference in New Issue