projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1652 from debuglevel/bugfix-crosscompile
[mono.git]
/
mono
/
mini
/
image-writer.c
diff --git
a/mono/mini/image-writer.c
b/mono/mini/image-writer.c
index acf392b440f7dfbb434a82c8ea79a71237af6283..599c9ef57293119d4eafc0ef5c4a11d68c98ed9b 100644
(file)
--- a/
mono/mini/image-writer.c
+++ b/
mono/mini/image-writer.c
@@
-1259,7
+1259,6
@@
static int normal_sections [] = { SECT_DATA, SECT_DEBUG_FRAME, SECT_DEBUG_INFO,
static int
bin_writer_emit_writeout (MonoImageWriter *acfg)
{
static int
bin_writer_emit_writeout (MonoImageWriter *acfg)
{
- FILE *file;
ElfHeader header;
ElfProgHeader progh [4];
ElfSectHeader secth [SECT_NUM];
ElfHeader header;
ElfProgHeader progh [4];
ElfSectHeader secth [SECT_NUM];
@@
-1277,11
+1276,9
@@
bin_writer_emit_writeout (MonoImageWriter *acfg)
ElfSymbol *symtab;
ElfDynamic dynamic [14];
int *hash;
ElfSymbol *symtab;
ElfDynamic dynamic [14];
int *hash;
- int i, num_sections, file_offset, virt_offset, size
, num_symtab
;
+ int i, num_sections, file_offset, virt_offset, size;
int num_local_syms;
int num_local_syms;
- file = acfg->fp;
-
/* Section headers */
memset (§h, 0, sizeof (secth));
memset (&dynamic, 0, sizeof (dynamic));
/* Section headers */
memset (§h, 0, sizeof (secth));
memset (&dynamic, 0, sizeof (dynamic));
@@
-1305,7
+1302,6
@@
bin_writer_emit_writeout (MonoImageWriter *acfg)
num_sections = collect_sections (acfg, secth, all_sections, 16);
hash = build_hash (acfg, num_sections, &dyn_str_table);
num_sections = collect_sections (acfg, secth, all_sections, 16);
hash = build_hash (acfg, num_sections, &dyn_str_table);
- num_symtab = hash [1]; /* FIXME */
#if 0
g_print ("num_sections: %d\n", num_sections);
g_print ("dynsym: %d, dynstr size: %d\n", hash [1], (int)dyn_str_table.data->len);
#if 0
g_print ("num_sections: %d\n", num_sections);
g_print ("dynsym: %d, dynstr size: %d\n", hash [1], (int)dyn_str_table.data->len);
@@
-1843,6
+1839,7
@@
asm_writer_emit_alignment (MonoImageWriter *acfg, int size)
#endif
}
#endif
}
+#ifndef USE_BIN_WRITER
static void
asm_writer_emit_alignment_fill (MonoImageWriter *acfg, int size, int fill)
{
static void
asm_writer_emit_alignment_fill (MonoImageWriter *acfg, int size, int fill)
{
@@
-1853,6
+1850,7
@@
asm_writer_emit_alignment_fill (MonoImageWriter *acfg, int size, int fill)
asm_writer_emit_alignment (acfg, size);
#endif
}
asm_writer_emit_alignment (acfg, size);
#endif
}
+#endif
#ifdef __native_client_codegen__
static void
#ifdef __native_client_codegen__
static void