diff options
| author | grischka <grischka> | 2015-05-09 14:29:39 +0200 |
|---|---|---|
| committer | grischka <grischka> | 2015-05-09 14:29:39 +0200 |
| commit | 30df3189b177c65d65094bed3a066a2722fe2dc0 (patch) | |
| tree | 5cc01304899af2f09b051cdb5cf980ceb8f6b9c1 /tccpe.c | |
| parent | 70a6c4601e471054edbe2fd984e37e2ca320db14 (diff) | |
| download | tinycc-30df3189b177c65d65094bed3a066a2722fe2dc0.tar.gz tinycc-30df3189b177c65d65094bed3a066a2722fe2dc0.tar.bz2 | |
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
Diffstat (limited to 'tccpe.c')
| -rw-r--r-- | tccpe.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1767,17 +1767,18 @@ static void pe_add_runtime(TCCState *s1, struct pe_info *pe) ELFW(ST_INFO)(STB_GLOBAL, STT_NOTYPE), 0, SHN_UNDEF, start_symbol); + tcc_add_pragma_libs(s1); + if (0 == s1->nostdlib) { static const char *libs[] = { - "libtcc1.a", "msvcrt", "kernel32", "", "user32", "gdi32", NULL + "tcc1", "msvcrt", "kernel32", "", "user32", "gdi32", NULL }; const char **pp, *p; for (pp = libs; 0 != (p = *pp); ++pp) { if (0 == *p) { if (PE_DLL != pe_type && PE_GUI != pe_type) break; - } else if (pp == libs ? tcc_add_dll(s1, p, 0) : tcc_add_library(s1, p)) { - tcc_error_noabort("cannot find library: %s", p); + } else if (tcc_add_library_err(s1, p) < 0) { break; } } @@ -1805,8 +1806,8 @@ ST_FUNC int pe_output_file(TCCState * s1, const char *filename) pe.filename = filename; pe.s1 = s1; - tcc_add_bcheck(s1); pe_add_runtime(s1, &pe); + tcc_add_bcheck(s1); relocate_common_syms(); /* assign bss adresses */ tcc_add_linker_symbols(s1); |
