embed sysimg data into llvm bc file also, making it equivalent to the…

… output-o file
inkydragon · Aug 16, 2015 · fcdb561 · fcdb561
1 parent e637e75
commit fcdb561
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -407,9 +407,9 @@ struct jl_varinfo_t {
 static void jl_dump_shadow(char *fname, int jit_model, const char *sysimg_data, size_t sysimg_len, bool dump_as_bc);
 
 extern "C"
-void jl_dump_bitcode(char *fname)
+void jl_dump_bitcode(char *fname, const char *sysimg_data, size_t sysimg_len)
 {
- jl_dump_shadow(fname, 0, NULL, 0, true);
+ jl_dump_shadow(fname, 0, sysimg_data, sysimg_len, true);
 }
 
 extern "C"

diff --git a/src/init.c b/src/init.c
@@ -634,7 +634,7 @@ static void julia_save()
  }
  else {
  ios_t *s = NULL;
- if (jl_options.outputo)
+ if (jl_options.outputo || jl_options.outputbc)
  s = jl_create_system_image();
 
  if (jl_options.outputji) {
@@ -651,7 +651,7 @@ static void julia_save()
  }
 
  if (jl_options.outputbc)
- jl_dump_bitcode((char*)jl_options.outputbc);
+ jl_dump_bitcode((char*)jl_options.outputbc, (const char*)s->buf, s->size);
 
  if (jl_options.outputo)
  jl_dump_objfile((char*)jl_options.outputo, 0, (const char*)s->buf, s->size);

diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -136,7 +136,7 @@ void _julia_init(JL_IMAGE_SEARCH rel);
 extern JL_THREAD void *jl_stackbase;
 #endif
 
-void jl_dump_bitcode(char *fname);
+void jl_dump_bitcode(char *fname, const char *sysimg_data, size_t sysimg_len);
 void jl_dump_objfile(char *fname, int jit_model, const char *sysimg_data, size_t sysimg_len);
 int32_t jl_get_llvm_gv(jl_value_t *p);
 void jl_idtable_rehash(jl_array_t **pa, size_t newsz);