The i386 calling convention expects the callee to pop 1 word of the stack when performing a struct ret.
Unified · Split
| @@ -26,8 +26,10 @@ else() · 25 unmodified lines | ||
| 26 | 26 | endif() |
| 27 | 27 | elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) |
| 28 | 28 | set(TCC_NATIVE_TARGET "x86_64") |
| 29 | + set(TCC_ARCH_DIR "x86_64-linux-gnu") | |
| 29 | 30 | else() |
| 30 | 31 | set(TCC_NATIVE_TARGET "i386") |
| 32 | + set(TCC_ARCH_DIR "i386-linux-gnu") | |
| 31 | 33 | endif() |
| 32 | 34 | endif() |
| 33 | 35 | |
| @@ -44,9 +46,9 @@ else() · 10 unmodified lines | ||
| 44 | 46 | endif() |
| 45 | 47 | |
| 46 | 48 | if(NOT WIN32) |
| 47 | − if(EXISTS /usr/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu/crti.o) | |
| 48 | − set(CONFIG_LDDIR lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu) | |
| 49 | − set(CONFIG_MULTIARCHDIR ${CMAKE_SYSTEM_PROCESSOR}-linux-gnu) | |
| 49 | + if(EXISTS /usr/lib/${TCC_ARCH_DIR}/crti.o) | |
| 50 | + set(CONFIG_LDDIR lib/${TCC_ARCH_DIR}) | |
| 51 | + set(CONFIG_MULTIARCHDIR ${TCC_ARCH_DIR}) | |
| 50 | 52 | elseif(EXISTS /usr/lib64/crti.o) |
| 51 | 53 | set(CONFIG_LDDIR lib64) |
| 52 | 54 | endif() |
| @@ -164,7 +166,10 @@ macro(make_tcc native_name cross_name cross_enabled definitions tcc_sources libt · 111 unmodified lines | ||
| 164 | 166 | tcctok.h |
| 165 | 167 | ${tcc_sources} |
| 166 | 168 | ) |
| 167 | − set_target_properties(libtcc PROPERTIES OUTPUT_NAME tcc PREFIX lib LINK_FLAGS "-Wl,--output-def,libtcc.def") | |
| 169 | + set_target_properties(libtcc PROPERTIES OUTPUT_NAME tcc PREFIX lib) | |
| 170 | + if(WIN32) | |
| 171 | + set_target_properties(libtcc PROPERTIES LINK_FLAGS "-Wl,--output-def,libtcc.def") | |
| 172 | + endif() | |
| 168 | 173 | add_executable(tcc tcc.c) |
| 169 | 174 | target_link_libraries(tcc libtcc) |
| 170 | 175 | if(NOT WIN32) |
| @@ -464,6 +464,10 @@ ST_FUNC void gfunc_call(int nb_args) · 463 unmodified lines | ||
| 464 | 464 | args_size -= 4; |
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | +#ifndef TCC_TARGET_PE | |
| 468 | + else if ((vtop->type.ref->type.t & VT_BTYPE) == VT_STRUCT) | |
| 469 | + args_size -= 4; | |
| 470 | +#endif | |
| 467 | 471 | gcall_or_jmp(0); |
| 468 | 472 | |
| 469 | 473 | if (args_size && func_call != FUNC_STDCALL) |
| @@ -549,6 +553,10 @@ ST_FUNC void gfunc_prolog(CType *func_type) · 79 unmodified lines | ||
| 549 | 553 | /* pascal type call ? */ |
| 550 | 554 | if (func_call == FUNC_STDCALL) |
| 551 | 555 | func_ret_sub = addr - 8; |
| 556 | +#ifndef TCC_TARGET_PE | |
| 557 | + else if (func_vc) | |
| 558 | + func_ret_sub = 4; | |
| 559 | +#endif | |
| 552 | 560 | |
| 553 | 561 | #ifdef CONFIG_TCC_BCHECK |
| 554 | 562 | /* leave some room for bound checking code */ |
| @@ -5,7 +5,7 @@ if(WIN32) · 4 unmodified lines | ||
| 5 | 5 | set(TCC_CFLAGS ${TCC_CFLAGS} -I${CMAKE_SOURCE_DIR}/win32/include) |
| 6 | 6 | else() |
| 7 | 7 | set(TCC_MATH_LDFLAGS -lm) |
| 8 | − set(LIBTCC_LDFLAGS -ldl -lm) | |
| 8 | + set(LIBTCC_LDFLAGS -ldl -lm -Wl,-rpath=${CMAKE_BINARY_DIR}) | |
| 9 | 9 | endif() |
| 10 | 10 | |
| 11 | 11 | add_executable(abitest-cc abitest.c) |
| @@ -61,7 +61,7 @@ if(PYTHONINTERP_FOUND) · 49 unmodified lines | ||
| 61 | 61 | add_test(test6 ${TCCTEST_PY} ${CMAKE_CURRENT_BINARY_DIR}/${TEST6}) |
| 62 | 62 | endif() |
| 63 | 63 | |
| 64 | − if(NOT WIN32 AND NOT TCC_NATIVE_TARGET STREQUAL "x86_64") | |
| 64 | + if(0) | |
| 65 | 65 | # Static output |
| 66 | 66 | set(TEST7 test7${CMAKE_EXECUTABLE_SUFFIX}) |
| 67 | 67 | add_custom_command(OUTPUT ${TEST7} COMMAND tcc ${TCC_TEST_CFLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/tcctest.c -static -o ${TEST7} DEPENDS tcc tcctest.c) |