49148020bc
Merge header files for m68k and m68knommu to the single location:
arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
BASE=${1%.h}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
120 lines
3.1 KiB
C
120 lines
3.1 KiB
C
#ifndef __ASMm68k_ELF_H
|
|
#define __ASMm68k_ELF_H
|
|
|
|
/*
|
|
* ELF register definitions..
|
|
*/
|
|
|
|
#include <asm/ptrace.h>
|
|
#include <asm/user.h>
|
|
|
|
/*
|
|
* 68k ELF relocation types
|
|
*/
|
|
#define R_68K_NONE 0
|
|
#define R_68K_32 1
|
|
#define R_68K_16 2
|
|
#define R_68K_8 3
|
|
#define R_68K_PC32 4
|
|
#define R_68K_PC16 5
|
|
#define R_68K_PC8 6
|
|
#define R_68K_GOT32 7
|
|
#define R_68K_GOT16 8
|
|
#define R_68K_GOT8 9
|
|
#define R_68K_GOT32O 10
|
|
#define R_68K_GOT16O 11
|
|
#define R_68K_GOT8O 12
|
|
#define R_68K_PLT32 13
|
|
#define R_68K_PLT16 14
|
|
#define R_68K_PLT8 15
|
|
#define R_68K_PLT32O 16
|
|
#define R_68K_PLT16O 17
|
|
#define R_68K_PLT8O 18
|
|
#define R_68K_COPY 19
|
|
#define R_68K_GLOB_DAT 20
|
|
#define R_68K_JMP_SLOT 21
|
|
#define R_68K_RELATIVE 22
|
|
|
|
typedef unsigned long elf_greg_t;
|
|
|
|
#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
|
|
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
|
|
|
|
typedef struct user_m68kfp_struct elf_fpregset_t;
|
|
|
|
/*
|
|
* This is used to ensure we don't load something for the wrong architecture.
|
|
*/
|
|
#define elf_check_arch(x) ((x)->e_machine == EM_68K)
|
|
|
|
/*
|
|
* These are used to set parameters in the core dumps.
|
|
*/
|
|
#define ELF_CLASS ELFCLASS32
|
|
#define ELF_DATA ELFDATA2MSB
|
|
#define ELF_ARCH EM_68K
|
|
|
|
/* For SVR4/m68k the function pointer to be registered with `atexit' is
|
|
passed in %a1. Although my copy of the ABI has no such statement, it
|
|
is actually used on ASV. */
|
|
#define ELF_PLAT_INIT(_r, load_addr) _r->a1 = 0
|
|
|
|
#define USE_ELF_CORE_DUMP
|
|
#ifndef CONFIG_SUN3
|
|
#define ELF_EXEC_PAGESIZE 4096
|
|
#else
|
|
#define ELF_EXEC_PAGESIZE 8192
|
|
#endif
|
|
|
|
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
|
|
use of this is to invoke "./ld.so someprog" to test out a new version of
|
|
the loader. We need to make sure that it is out of the way of the program
|
|
that it will "exec", and that there is sufficient room for the brk. */
|
|
|
|
#ifndef CONFIG_SUN3
|
|
#define ELF_ET_DYN_BASE 0xD0000000UL
|
|
#else
|
|
#define ELF_ET_DYN_BASE 0x0D800000UL
|
|
#endif
|
|
|
|
#define ELF_CORE_COPY_REGS(pr_reg, regs) \
|
|
/* Bleech. */ \
|
|
pr_reg[0] = regs->d1; \
|
|
pr_reg[1] = regs->d2; \
|
|
pr_reg[2] = regs->d3; \
|
|
pr_reg[3] = regs->d4; \
|
|
pr_reg[4] = regs->d5; \
|
|
pr_reg[7] = regs->a0; \
|
|
pr_reg[8] = regs->a1; \
|
|
pr_reg[9] = regs->a2; \
|
|
pr_reg[14] = regs->d0; \
|
|
pr_reg[15] = rdusp(); \
|
|
pr_reg[16] = regs->orig_d0; \
|
|
pr_reg[17] = regs->sr; \
|
|
pr_reg[18] = regs->pc; \
|
|
pr_reg[19] = (regs->format << 12) | regs->vector; \
|
|
{ \
|
|
struct switch_stack *sw = ((struct switch_stack *)regs) - 1; \
|
|
pr_reg[5] = sw->d6; \
|
|
pr_reg[6] = sw->d7; \
|
|
pr_reg[10] = sw->a3; \
|
|
pr_reg[11] = sw->a4; \
|
|
pr_reg[12] = sw->a5; \
|
|
pr_reg[13] = sw->a6; \
|
|
}
|
|
|
|
/* This yields a mask that user programs can use to figure out what
|
|
instruction set this cpu supports. */
|
|
|
|
#define ELF_HWCAP (0)
|
|
|
|
/* This yields a string that ld.so will use to load implementation
|
|
specific libraries for optimization. This is more specific in
|
|
intent than poking at uname or /proc/cpuinfo. */
|
|
|
|
#define ELF_PLATFORM (NULL)
|
|
|
|
#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
|
|
|
|
#endif
|