Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Share <machine/elf_machdep.h> between arm26 and arm32.
details: https://anonhg.NetBSD.org/src/rev/536c85a01676
branches: trunk
changeset: 502113:536c85a01676
user: bjh21 <bjh21%NetBSD.org@localhost>
date: Thu Jan 11 22:28:06 2001 +0000
description:
Share <machine/elf_machdep.h> between arm26 and arm32.
diffstat:
sys/arch/arm/include/Makefile | 6 ++--
sys/arch/arm/include/elf_machdep.h | 44 +++++++++++++++++++++++++++++++++++
sys/arch/arm26/include/elf_machdep.h | 45 +----------------------------------
sys/arch/arm32/include/Makefile | 8 +++---
sys/arch/arm32/include/elf_machdep.h | 3 ++
5 files changed, 56 insertions(+), 50 deletions(-)
diffs (143 lines):
diff -r 0c0ddd84c8e7 -r 536c85a01676 sys/arch/arm/include/Makefile
--- a/sys/arch/arm/include/Makefile Thu Jan 11 22:26:55 2001 +0000
+++ b/sys/arch/arm/include/Makefile Thu Jan 11 22:28:06 2001 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/01/11 21:05:03 bjh21 Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/11 22:28:07 bjh21 Exp $
KDIR= /sys/arch/arm/include
INCSDIR= /usr/include/arm
INCS= ansi.h aout_machdep.h asm.h bswap.h cdefs.h disklabel.h \
- disklabel_acorn.h float.h fp.h ieee.h ieeefp.h int_types.h \
- limits.h lock.h math.h setjmp.h stdarg.h trap.h varargs.h
+ disklabel_acorn.h elf_machdep.h float.h fp.h ieee.h ieeefp.h \
+ int_types.h limits.h lock.h math.h setjmp.h stdarg.h trap.h varargs.h
.include <bsd.kinc.mk>
diff -r 0c0ddd84c8e7 -r 536c85a01676 sys/arch/arm/include/elf_machdep.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/include/elf_machdep.h Thu Jan 11 22:28:06 2001 +0000
@@ -0,0 +1,44 @@
+/* $NetBSD: elf_machdep.h,v 1.1 2001/01/11 22:28:07 bjh21 Exp $ */
+
+#define ELF32_MACHDEP_ENDIANNESS ELFDATA2LSB
+
+/* Processor specific flags for the ELF header e_flags field. */
+#define EF_ARM_RELEXEC 0x00000001
+#define EF_ARM_HASENTRY 0x00000002
+#define EF_ARM_INTERWORK 0x00000004 /* GNU binutils 000413 */
+#define EF_ARM_SYMSARESORTED 0x00000004 /* ARM ELF A08 */
+#define EF_ARM_APCS_26 0x00000008
+#define EF_ARM_APCS_FLOAT 0x00000010
+#define EF_ARM_PIC 0x00000020
+#define EF_ARM_ALIGN8 0x00000040 /* 8-bit structure alignment. */
+#define EF_ARM_NEW_ABI 0x00000080
+#define EF_ARM_OLD_ABI 0x00000100
+#define EF_ARM_SOFT_FLOAT 0x00000200
+#define EF_ARM_EABIMASK 0xff000000
+
+#define ELF32_MACHDEP_ID_CASES \
+ case EM_ARM: \
+ break;
+
+#define ARCH_ELFSIZE 32 /* MD native binary size */
+
+#define R_ARM_NONE 0
+#define R_ARM_PC24 1
+#define R_ARM_ABS32 2
+#define R_ARM_REL32 3
+#define R_ARM_PC13 4
+#define R_ARM_ABS16 5
+#define R_ARM_ABS12 6
+#define R_ARM_THM_ABS5 7
+#define R_ARM_ABS8 8
+#define R_ARM_SBREL32 9
+#define R_ARM_THM_PC22 10
+#define R_ARM_THM_PC8 11
+#define R_ARM_AMP_VCALL9 12
+#define R_ARM_SWI24 13
+#define R_ARM_THM_SWI8 14
+#define R_ARM_XPC25 15
+#define R_ARM_THM_XPC22 16
+
+#define R_TYPE(name) __CONCAT(R_ARM_,name)
+
diff -r 0c0ddd84c8e7 -r 536c85a01676 sys/arch/arm26/include/elf_machdep.h
--- a/sys/arch/arm26/include/elf_machdep.h Thu Jan 11 22:26:55 2001 +0000
+++ b/sys/arch/arm26/include/elf_machdep.h Thu Jan 11 22:28:06 2001 +0000
@@ -1,44 +1,3 @@
-/* $NetBSD: elf_machdep.h,v 1.1 2000/05/09 21:55:59 bjh21 Exp $ */
-
-#define ELF32_MACHDEP_ENDIANNESS ELFDATA2LSB
-
-/* Processor specific flags for the ELF header e_flags field. */
-#define EF_ARM_RELEXEC 0x00000001
-#define EF_ARM_HASENTRY 0x00000002
-#define EF_ARM_INTERWORK 0x00000004 /* GNU binutils 000413 */
-#define EF_ARM_SYMSARESORTED 0x00000004 /* ARM ELF A08 */
-#define EF_ARM_APCS_26 0x00000008
-#define EF_ARM_APCS_FLOAT 0x00000010
-#define EF_ARM_PIC 0x00000020
-#define EF_ARM_ALIGN8 0x00000040 /* 8-bit structure alignment. */
-#define EF_ARM_NEW_ABI 0x00000080
-#define EF_ARM_OLD_ABI 0x00000100
-#define EF_ARM_SOFT_FLOAT 0x00000200
-#define EF_ARM_EABIMASK 0xff000000
-
-#define ELF32_MACHDEP_ID_CASES \
- case EM_ARM: \
- break;
+/* $NetBSD: elf_machdep.h,v 1.2 2001/01/11 22:28:06 bjh21 Exp $ */
-#define ARCH_ELFSIZE 32 /* MD native binary size */
-
-#define R_ARM_NONE 0
-#define R_ARM_PC24 1
-#define R_ARM_ABS32 2
-#define R_ARM_REL32 3
-#define R_ARM_PC13 4
-#define R_ARM_ABS16 5
-#define R_ARM_ABS12 6
-#define R_ARM_THM_ABS5 7
-#define R_ARM_ABS8 8
-#define R_ARM_SBREL32 9
-#define R_ARM_THM_PC22 10
-#define R_ARM_THM_PC8 11
-#define R_ARM_AMP_VCALL9 12
-#define R_ARM_SWI24 13
-#define R_ARM_THM_SWI8 14
-#define R_ARM_XPC25 15
-#define R_ARM_THM_XPC22 16
-
-#define R_TYPE(name) __CONCAT(R_ARM_,name)
-
+#include <arm/elf_machdep.h>
diff -r 0c0ddd84c8e7 -r 536c85a01676 sys/arch/arm32/include/Makefile
--- a/sys/arch/arm32/include/Makefile Thu Jan 11 22:26:55 2001 +0000
+++ b/sys/arch/arm32/include/Makefile Thu Jan 11 22:28:06 2001 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.10 2000/06/26 15:42:24 kleink Exp $
+# $NetBSD: Makefile,v 1.11 2001/01/11 22:28:06 bjh21 Exp $
KDIR= /sys/arch/arm32/include
INCSDIR= /usr/include/arm32
INCS= ansi.h aout_machdep.h asm.h beep.h bootconfig.h bswap.h bus.h cdefs.h \
conf.h cpu.h cpufunc.h cpus.h db_machdep.h devmap.h disklabel.h \
- disklabel_acorn.h endian.h endian_machdep.h float.h fp.h frame.h \
- ieee.h ieeefp.h iic.h int_types.h intr.h io.h ipkdb.h irqhandler.h \
- joystick.h katelib.h kbd.h limits.h lock.h math.h mouse.h \
+ disklabel_acorn.h elf_machdep.h endian.h endian_machdep.h float.h \
+ fp.h frame.h ieee.h ieeefp.h iic.h int_types.h intr.h io.h ipkdb.h \
+ irqhandler.h joystick.h katelib.h kbd.h limits.h lock.h math.h mouse.h \
param.h pcb.h pmap.h proc.h profile.h psl.h pte.h ptrace.h reg.h \
rtc.h setjmp.h signal.h stdarg.h sysarch.h trap.h types.h \
undefined.h varargs.h vconsole.h vidc.h vmparam.h
diff -r 0c0ddd84c8e7 -r 536c85a01676 sys/arch/arm32/include/elf_machdep.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm32/include/elf_machdep.h Thu Jan 11 22:28:06 2001 +0000
@@ -0,0 +1,3 @@
+/* $NetBSD: elf_machdep.h,v 1.1 2001/01/11 22:28:06 bjh21 Exp $ */
+
+#include <arm/elf_machdep.h>
Home |
Main Index |
Thread Index |
Old Index