Revert commit 55f8963dfa from wanjochan until better tested on all platforms

This commit is contained in:
Christian Jullien 2020-09-10 05:49:15 +02:00
parent 310e3b428c
commit 60c1f70bb9
3 changed files with 4 additions and 11 deletions

View File

@ -252,7 +252,7 @@ libtcc.dylib: $(LIBTCC_OBJ)
# OSX libtcc.dylib (without rpath/ prefix)
libtcc.osx: $(LIBTCC_OBJ)
$S$(CC) -shared -o libtcc.dylib $^ $(LDFLAGS)
$S$(CC) -shared -install_name libtcc.dylib -o libtcc.dylib $^ $(LDFLAGS)
# windows dynamic libtcc library
libtcc.dll : $(LIBTCC_OBJ)

View File

@ -1457,10 +1457,7 @@ ST_FUNC void tcc_add_runtime(TCCState *s1)
tcc_add_btstub(s1);
}
#endif
/* libtcc1 is not needed when tccrun mode */
if (s1->output_type != TCC_OUTPUT_MEMORY){
tcc_add_support(s1, TCC_LIBTCC1);
}
tcc_add_support(s1, TCC_LIBTCC1);
#ifndef TCC_TARGET_MACHO
/* add crt end if not memory output */
if (s1->output_type != TCC_OUTPUT_MEMORY)

View File

@ -813,12 +813,8 @@ ST_FUNC int macho_output_file(TCCState *s1, const char *filename)
Section *s;
collect_sections(s1, &mo);
relocate_syms(s1, s1->symtab, 0);
if (s1->output_type == TCC_OUTPUT_DLL) {
/* TODO: more handling for .dylib ? */
} else {
mo.ep->entryoff = get_sym_addr(s1, "main", 1, 1)
- get_segment(&mo, 1)->vmaddr;
}
mo.ep->entryoff = get_sym_addr(s1, "main", 1, 1)
- get_segment(&mo, 1)->vmaddr;
if (s1->nb_errors)
goto do_ret;