This was already possible using make NOTALLINONE=1 and is now the default. To build as previously from one big source, use make ONE_SOURCE=1 Cross compilers are still build from one source because using separate objects requires separate build directories one per platform which currently is not (yet) supported by the makefile. We could probably use gnu-makeish target variables like $(I386_CROSS): OUTDIR=build/i386 $(X64_CROSS): OUTDIR=build/x86-64 and so on ... Also NEED_FLOAT_TYPES for arm-gen is removed. It was about variables that are referenced from outside (libtcc, tccgen). We could declare them in tcc.h (as with reg_classes) or have them twice in arm-gen.c. I chose option 2.
Unified · Split
| @@ -157,7 +157,7 @@ tcc$(EXESUF): tcc.o $(LIBTCC) · 156 unmodified lines | ||
| 157 | 157 | |
| 158 | 158 | # Cross Tiny C Compilers |
| 159 | 159 | %-tcc$(EXESUF): |
| 160 | − $(CC) -o $@ tcc.c $(DEFINES) $(CFLAGS) $(LIBS) $(LDFLAGS) | |
| 160 | + $(CC) -o $@ tcc.c -DONE_SOURCE $(DEFINES) $(CFLAGS) $(LIBS) $(LDFLAGS) | |
| 161 | 161 | |
| 162 | 162 | $(I386_CROSS): DEFINES = -DTCC_TARGET_I386 -DCONFIG_TCCDIR="\"$(tccdir)/i386\"" |
| 163 | 163 | $(X64_CROSS): DEFINES = -DTCC_TARGET_X86_64 |
| @@ -179,14 +179,13 @@ $(C67_CROSS): $(C67_FILES) · 15 unmodified lines | ||
| 179 | 179 | $(ARM_FPA_CROSS) $(ARM_FPA_LD_CROSS) $(ARM_VFP_CROSS) $(ARM_EABI_CROSS): $(ARM_FILES) |
| 180 | 180 | |
| 181 | 181 | # libtcc generation and test |
| 182 | −ifdef NOTALLINONE | |
| 182 | +ifndef ONE_SOURCE | |
| 183 | 183 | LIBTCC_OBJ = $(filter-out tcc.o,$(patsubst %.c,%.o,$(filter %.c,$(NATIVE_FILES)))) |
| 184 | 184 | LIBTCC_INC = $(filter %.h,$(CORE_FILES)) $(filter-out $(CORE_FILES),$(NATIVE_FILES)) |
| 185 | −$(LIBTCC_OBJ) tcc.o : NATIVE_DEFINES += -DNOTALLINONE | |
| 186 | 185 | else |
| 187 | 186 | LIBTCC_OBJ = libtcc.o |
| 188 | 187 | LIBTCC_INC = $(NATIVE_FILES) |
| 189 | −tcc.o : NATIVE_DEFINES += -DNOTALLINONE | |
| 188 | +$(LIBTCC_OBJ) tcc.o : NATIVE_DEFINES += -DONE_SOURCE | |
| 190 | 189 | endif |
| 191 | 190 | |
| 192 | 191 | $(LIBTCC_OBJ) tcc.o : %.o : %.c $(LIBTCC_INC) |
| @@ -102,10 +102,8 @@ enum { · 101 unmodified lines | ||
| 102 | 102 | //#define FUNC_STRUCT_PARAM_AS_PTR |
| 103 | 103 | |
| 104 | 104 | #if defined(TCC_ARM_EABI) && defined(TCC_ARM_VFP) |
| 105 | −#ifdef NEED_FLOAT_TYPES | |
| 106 | −static CType float_type, double_type, func_float_type, func_double_type; | |
| 105 | +ST_DATA CType float_type, double_type, func_float_type, func_double_type; | |
| 107 | 106 | #define func_ldouble_type func_double_type |
| 108 | −#endif | |
| 109 | 107 | #else |
| 110 | 108 | #define func_float_type func_old_type |
| 111 | 109 | #define func_double_type func_old_type |
| @@ -172,6 +170,11 @@ ST_DATA const int reg_classes[NB_REGS] = { · 60 unmodified lines | ||
| 172 | 170 | #endif |
| 173 | 171 | }; |
| 174 | 172 | |
| 173 | +/* keep in sync with line 104 above */ | |
| 174 | +#if defined(TCC_ARM_EABI) && defined(TCC_ARM_VFP) | |
| 175 | +ST_DATA CType float_type, double_type, func_float_type, func_double_type; | |
| 176 | +#endif | |
| 177 | + | |
| 175 | 178 | static int func_sub_sp_offset, last_itod_magic; |
| 176 | 179 | static int leaffunc; |
| 177 | 180 | |
| @@ -18,7 +18,6 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#define NEED_FLOAT_TYPES | |
| 22 | 21 | #include "tcc.h" |
| 23 | 22 | |
| 24 | 23 | /********************************************************/ |
| @@ -41,7 +40,7 @@ ST_DATA void *rt_prog_main; · 16 unmodified lines | ||
| 41 | 40 | |
| 42 | 41 | /********************************************************/ |
| 43 | 42 | |
| 44 | −#ifndef NOTALLINONE | |
| 43 | +#ifdef ONE_SOURCE | |
| 45 | 44 | #include "tccpp.c" |
| 46 | 45 | #include "tccgen.c" |
| 47 | 46 | #include "tccelf.c" |
| @@ -18,10 +18,10 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#if defined NOTALLINONE || defined TCC_USE_LIBTCC | |
| 22 | −#include "tcc.h" | |
| 23 | −#else | |
| 21 | +#ifdef ONE_SOURCE | |
| 24 | 22 | #include "libtcc.c" |
| 23 | +#else | |
| 24 | +#include "tcc.h" | |
| 25 | 25 | #endif |
| 26 | 26 | |
| 27 | 27 | static char **files; |
| @@ -877,7 +877,7 @@ static inline int toup(int c) · 876 unmodified lines | ||
| 877 | 877 | |
| 878 | 878 | #define PUB_FUNC |
| 879 | 879 | |
| 880 | −#ifndef NOTALLINONE | |
| 880 | +#ifdef ONE_SOURCE | |
| 881 | 881 | #define ST_INLN static inline |
| 882 | 882 | #define ST_FUNC static |
| 883 | 883 | #define ST_DATA static |
| @@ -1278,7 +1278,7 @@ ST_DATA const int reg_classes[NB_REGS]; · 394 unmodified lines | ||
| 1278 | 1278 | |
| 1279 | 1279 | /********************************************************/ |
| 1280 | 1280 | #undef ST_DATA |
| 1281 | −#ifndef NOTALLINONE | |
| 1281 | +#ifdef ONE_SOURCE | |
| 1282 | 1282 | #define ST_DATA static |
| 1283 | 1283 | #else |
| 1284 | 1284 | #define ST_DATA |
| @@ -376,7 +376,7 @@ static int pe_find_import(TCCState * s1, ElfW(Sym) *sym) · 375 unmodified lines | ||
| 376 | 376 | { |
| 377 | 377 | char buffer[200]; |
| 378 | 378 | const char *s, *p; |
| 379 | − int sym_index, n = 0; | |
| 379 | + int sym_index = 0, n = 0; | |
| 380 | 380 | |
| 381 | 381 | do { |
| 382 | 382 | s = pe_export_name(s1, sym); |
| @@ -29,11 +29,11 @@ echo>>..\config.h #define CONFIG_SYSROOT "" · 28 unmodified lines | ||
| 29 | 29 | :libtcc |
| 30 | 30 | if not exist libtcc\nul mkdir libtcc |
| 31 | 31 | copy ..\libtcc.h libtcc\libtcc.h |
| 32 | −%CC% %target% -fno-strict-aliasing ../libtcc.c -c -o libtcc.o | |
| 32 | +%CC% %target% -fno-strict-aliasing -DONE_SOURCE ../libtcc.c -c -o libtcc.o | |
| 33 | 33 | %AR% rcs libtcc/libtcc.a libtcc.o |
| 34 | 34 | |
| 35 | 35 | :tcc |
| 36 | −%CC% %target% -fno-strict-aliasing ../tcc.c -o tcc.exe -DTCC_USE_LIBTCC -ltcc -Llibtcc | |
| 36 | +%CC% %target% -fno-strict-aliasing ../tcc.c -o tcc.exe -ltcc -Llibtcc | |
| 37 | 37 | |
| 38 | 38 | :copy_std_includes |
| 39 | 39 | copy ..\include\*.h include |