Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / mini / image-writer.h

diff --git a/mono/mini/image-writer.h b/mono/mini/image-writer.h
index 2af57cbe105d3e93fd8876e59a47fbdf16840694..0c34246422e8b90c7c397a1647be7d7b0d962bb0 100644 (file)
--- a/mono/mini/image-writer.h
+++ b/mono/mini/image-writer.h
@@ -1,5 +1,6 @@
-/*
- * image-writer.h: Creation of object files or assembly files using the same interface.
+/**
+ * \file
+ * Creation of object files or assembly files using the same interface.
  *
  * Author:
  *   Dietmar Maurer (dietmar@ximian.com);
@@ -21,6 +22,31 @@
 
 typedef struct _MonoImageWriter MonoImageWriter;
 
+#if defined(TARGET_AMD64) && !defined(HOST_WIN32) && !defined(__APPLE__)
+#define USE_ELF_WRITER 1
+#define USE_ELF_RELA 1
+#endif
+
+#if defined(TARGET_X86) && !defined(HOST_WIN32) && !defined(__APPLE__)
+#define USE_ELF_WRITER 1
+#endif
+
+#if defined(TARGET_ARM) && !defined(TARGET_MACH) && !defined(HOST_WIN32)
+//#define USE_ELF_WRITER 1
+#endif
+
+#if defined(__mips__)
+#define USE_ELF_WRITER 1
+#endif
+
+#if defined(TARGET_X86) && defined(__APPLE__)
+//#define USE_MACH_WRITER
+#endif
+
+#if defined(USE_ELF_WRITER) || defined(USE_MACH_WRITER)
+#define USE_BIN_WRITER 1
+#endif
+
 /* Relocation types */
 #define R_ARM_CALL 28
 #define R_ARM_JUMP24 29
@@ -64,10 +90,6 @@ void mono_img_writer_emit_alignment (MonoImageWriter *w, int size);
 
 void mono_img_writer_emit_alignment_fill (MonoImageWriter *w, int size, int fill);
 
-#ifdef __native_client_codegen__
-void mono_img_writer_emit_nacl_call_alignment (MonoImageWriter *w);
-#endif
-
 void mono_img_writer_emit_pointer_unaligned (MonoImageWriter *w, const char *target);
 
 void mono_img_writer_emit_pointer (MonoImageWriter *w, const char *target);