d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bsd update

Browse source 
Fix crtbegin/crtend
Use dlsym on all bsd targets
Check .eh_frame on all bsd targets
Disable test3 on FreeBSD and NetBSD and use test1 instead because dlsym not working (WIP)
Disable dlltest and 113_btdll on NetBSD because text relocations are not allowed
Disable 115_bound_setjmp on NetBSD because longjmp is renamed into __longjmp14
This commit is contained in:
herman ten brugge 2020-12-19 20:55:52 +01:00
parent a87dee588b
commit 7f898abb82
4 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libtcc.c
View file

@ -1105,23 +1105,25 @@ LIBTCCAPI int tcc_set_output_type(TCCState *s, int output_type)
/* add libc crt1/crti objects */
if ((output_type == TCC_OUTPUT_EXE || output_type == TCC_OUTPUT_DLL) &&
!s->nostdlib) {
#if TARGETOS_OpenBSD || TARGETOS_FreeBSD || TARGETOS_NetBSD
#if TARGETOS_OpenBSD
if (output_type != TCC_OUTPUT_DLL)
tcc_add_crt(s, "crt0.o");
if (output_type == TCC_OUTPUT_DLL)
tcc_add_crt(s, "crtbeginS.o");
else
tcc_add_crt(s, "crtbegin.o");
#elif TARGETOS_FreeBSD
if (output_type != TCC_OUTPUT_DLL)
tcc_add_crt(s, "crt1.o");
tcc_add_crt(s, "crti.o");
tcc_add_crt(s, "crtbegin.o");
#elif TARGETOS_NetBSD
if (output_type != TCC_OUTPUT_DLL)
tcc_add_crt(s, "crt0.o");
tcc_add_crt(s, "crti.o");
tcc_add_crt(s, "crtbegin.o");
#endif
if (s->static_link)
tcc_add_crt(s, "crtbeginT.o");
else if (output_type == TCC_OUTPUT_DLL)
tcc_add_crt(s, "crtbeginS.o");
else
tcc_add_crt(s, "crtbegin.o");
#elif !TCC_TARGET_MACHO
/* Mach-O with LC_MAIN doesn't need any crt startup code. */
if (output_type != TCC_OUTPUT_DLL)

15
tccelf.c
View file

@ -915,7 +915,7 @@ ST_FUNC void relocate_syms(TCCState *s1, Section *symtab, int do_resolve)
#if defined TCC_IS_NATIVE && !defined TCC_TARGET_PE
/* dlsym() needs the undecorated name. */
void *addr = dlsym(RTLD_DEFAULT, &name[s1->leading_underscore]);
#if TARGETOS_OpenBSD
#if TARGETOS_OpenBSD || TARGETOS_FreeBSD || TARGETOS_NetBSD
if (addr == NULL) {
int i;
for (i = 0; i < s1->nb_loaded_dlls; i++)
@ -1460,10 +1460,11 @@ ST_FUNC void tcc_add_runtime(TCCState *s1)
tcc_add_support(s1, TCC_LIBTCC1);
#if TARGETOS_OpenBSD || TARGETOS_FreeBSD || TARGETOS_NetBSD
/* add crt end if not memory output */
if (s1->output_type == TCC_OUTPUT_DLL)
tcc_add_crt(s1, "crtendS.o");
else if (s1->output_type != TCC_OUTPUT_MEMORY) {
tcc_add_crt(s1, "crtend.o");
if (s1->output_type != TCC_OUTPUT_MEMORY) {
if (s1->output_type == TCC_OUTPUT_DLL)
tcc_add_crt(s1, "crtendS.o");
else
tcc_add_crt(s1, "crtend.o");
#if TARGETOS_FreeBSD || TARGETOS_NetBSD
tcc_add_crt(s1, "crtn.o");
#endif
@ -2856,8 +2857,8 @@ ST_FUNC int tcc_load_object_file(TCCState *s1,
sm_table[i].new_section = 1;
found:
if (sh->sh_type != s->sh_type) {
#if TARGETOS_OpenBSD
if (strcmp (s->name, ".eh_frame") || sh->sh_type != SHT_PROGBITS)
#if TARGETOS_OpenBSD || TARGETOS_FreeBSD || TARGETOS_NetBSD
if (strcmp (s->name, ".eh_frame"))
#endif
{
tcc_error_noabort("invalid section type");

11
tests/Makefile
View file

@ -64,6 +64,17 @@ endif
ifeq ($(TARGETOS),OpenBSD)
dlltest: CFLAGS+=-fno-stack-protector
endif
ifeq ($(TARGETOS),FreeBSD)
# test3 has dlsym problems
TESTS := $(filter-out test3,$(TESTS))
TESTS += test1
endif
ifeq ($(TARGETOS),NetBSD)
# test3 has dlsym problems
# dlltest does not allow text relocations
TESTS := $(filter-out test3 dlltest,$(TESTS))
TESTS += test1
endif
RUN_TCC = $(NATIVE_DEFINES) -run $(TOPSRC)/tcc.c $(TCCFLAGS)
DISAS = objdump -d

4
tests/tests2/Makefile
View file

@ -52,6 +52,10 @@ ifneq (,$(filter OpenBSD FreeBSD NetBSD,$(TARGETOS)))
SKIP += 106_pthread.test # no pthread_condattr_setpshared
SKIP += 114_bound_signal.test # libc problem signal/fork
endif
ifeq ($(TARGETOS),NetBSD)
SKIP += 113_btdll.test # text relocations
SKIP += 115_bound_setjmp.test # longjmp renamed to __longjmp14
endif
# Some tests might need arguments
ARGS =