cvsuser 03/12/01 13:22:24
Modified: include/parrot exec.h
src exec_save.c
Log:
Patch courtesy of Adam Thomason
This attached patch adds support for OpenBSD 3.4 (which uses ELF), without
affecting older versions using a.out (hopefully). This cures the tinder build
failure on phalanx. Thanks to Daniel for help tracking down the necessary
symbols.
See http://rt.perl.org:80/rt3/Ticket/Display.html?id=24579
Revision Changes Path
1.9 +6 -2 parrot/include/parrot/exec.h
Index: exec.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/exec.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- exec.h 1 Nov 2003 12:07:16 -0000 1.8
+++ exec.h 1 Dec 2003 21:22:21 -0000 1.9
@@ -2,7 +2,7 @@
* exec.h
*
* CVS Info
- * $Id: exec.h,v 1.8 2003/11/01 12:07:16 leo Exp $
+ * $Id: exec.h,v 1.9 2003/12/01 21:22:21 nicholas Exp $
* Overview:
* Exec header file.
* History:
@@ -16,7 +16,11 @@
# define EXEC_H_GUARD
# if PARROT_EXEC_OS_OPENBSD
+# ifdef PARROT_OPENBSD_ELF
+# define EXEC_ELF
+# else
# define EXEC_A_OUT
+# endif
# endif
# if PARROT_EXEC_OS_DARWIN
# define EXEC_MACH_O
1.10 +7 -1 parrot/src/exec_save.c
Index: exec_save.c
===================================================================
RCS file: /cvs/public/parrot/src/exec_save.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- exec_save.c 23 Oct 2003 17:48:59 -0000 1.9
+++ exec_save.c 1 Dec 2003 21:22:24 -0000 1.10
@@ -2,7 +2,7 @@
* exec_save.c
*
* CVS Info
- * $Id: exec_save.c,v 1.9 2003/10/23 17:48:59 robert Exp $
+ * $Id: exec_save.c,v 1.10 2003/12/01 21:22:24 nicholas Exp $
* Overview:
* Save the Parrot_exec_objfile_t to the native format
* History:
@@ -122,7 +122,13 @@
#ifdef EXEC_ELF
+# if PARROT_EXEC_OS_OPENBSD
+# define R_386_32 1
+# define R_386_PC32 2
+# include <elf_abi.h>
+# else
# include <elf.h>
+# endif
/* Add a section to the file
*
