Compatibility symlinks are put in place in case some script were relying on former names except for CMake since it was added after last release.
Unified · Split
| @@ -195,58 +195,53 @@ macro(make_tcc native_name cross_name cross_enabled definitions tcc_sources libt · 194 unmodified lines | ||
| 195 | 195 | endif() |
| 196 | 196 | endmacro() |
| 197 | 197 | |
| 198 | −make_tcc("Win32" i386-win32 TCC_BUILD_WIN32 | |
| 198 | +make_tcc("Win32" i386-w64-mingw32 TCC_BUILD_WIN32 | |
| 199 | 199 | "TCC_TARGET_I386;TCC_TARGET_PE" |
| 200 | 200 | "${I386_SOURCES};tccpe.c" |
| 201 | 201 | tiny_libmaker_32 "${LIBTCC1_I386_SOURCES};${LIBTCC1_WIN_SOURCES}" "win32/include;win32/include/winapi" |
| 202 | 202 | ) |
| 203 | −make_tcc("Win64" x86_64-win32 TCC_BUILD_WIN64 | |
| 203 | +make_tcc("Win64" x86_64-w64-mingw32 TCC_BUILD_WIN64 | |
| 204 | 204 | "TCC_TARGET_X86_64;TCC_TARGET_PE" |
| 205 | 205 | "${X86_64_SOURCES};tccpe.c" |
| 206 | 206 | tiny_libmaker_64 "lib/alloca86_64.S;${LIBTCC1_WIN_SOURCES}" "win32/include;win32/include/winapi" |
| 207 | 207 | ) |
| 208 | −make_tcc("WinCE" arm-win32 TCC_BUILD_WINCE | |
| 208 | +make_tcc("WinCE" arm-wince-mingw32ce TCC_BUILD_WINCE | |
| 209 | 209 | "TCC_TARGET_ARM;TCC_ARM_VERSION=${TCC_ARM_VERSION};TCC_TARGET_PE" |
| 210 | 210 | "${ARM_SOURCES};tccpe.c" |
| 211 | 211 | "" "" "" |
| 212 | 212 | ) |
| 213 | −make_tcc("i386" i386 TCC_BUILD_I386 | |
| 213 | +make_tcc("i386" i386-linux-gnu TCC_BUILD_I386 | |
| 214 | 214 | TCC_TARGET_I386 |
| 215 | 215 | "${I386_SOURCES}" |
| 216 | 216 | tiny_libmaker_32 "${LIBTCC1_I386_SOURCES}" "" |
| 217 | 217 | ) |
| 218 | −make_tcc("x86_64" x86_64 TCC_BUILD_X64 | |
| 218 | +make_tcc("x86_64" x86_64-linux-gnu TCC_BUILD_X64 | |
| 219 | 219 | TCC_TARGET_X86_64 |
| 220 | 220 | "${X86_64_SOURCES}" |
| 221 | 221 | tiny_libmaker_64 "lib/alloca86_64.S" "" |
| 222 | 222 | ) |
| 223 | 223 | set(ARM_DEFINITIONS TCC_TARGET_ARM TCC_ARM_VERSION=${TCC_ARM_VERSION}) |
| 224 | −make_tcc("ARM" arm TCC_BUILD_ARM | |
| 225 | − "${ARM_DEFINITIONS};WITHOUT_LIBTCC" | |
| 226 | − "${ARM_SOURCES}" | |
| 227 | − "" "" "" | |
| 228 | −) | |
| 229 | −make_tcc("" arm-eabihf TCC_BUILD_ARM_EABIHF | |
| 224 | +make_tcc("" arm-linux-gnueabihf TCC_BUILD_ARM_EABIHF | |
| 230 | 225 | "${ARM_DEFINITIONS};TCC_ARM_EABI;TCC_ARM_HARDFLOAT" |
| 231 | 226 | "${ARM_SOURCES}" |
| 232 | 227 | "" "" "" |
| 233 | 228 | ) |
| 234 | −make_tcc("" arm-eabi TCC_BUILD_ARM_EABI | |
| 229 | +make_tcc("" arm-linux-gnueabi TCC_BUILD_ARM_EABI | |
| 235 | 230 | "${ARM_DEFINITIONS};TCC_ARM_EABI" |
| 236 | 231 | "${ARM_SOURCES}" |
| 237 | 232 | "" "" "" |
| 238 | 233 | ) |
| 239 | −make_tcc("" arm-fpa TCC_BUILD_ARM_FPA | |
| 234 | +make_tcc("" arm-linux-fpa TCC_BUILD_ARM_FPA | |
| 240 | 235 | "${ARM_DEFINITIONS}" |
| 241 | 236 | "${ARM_SOURCES}" |
| 242 | 237 | "" "" "" |
| 243 | 238 | ) |
| 244 | −make_tcc("" arm-fpa-ld TCC_BUILD_ARM_FPA_LD | |
| 239 | +make_tcc("" arm-linux-fpa-ld TCC_BUILD_ARM_FPA_LD | |
| 245 | 240 | "${ARM_DEFINITIONS};LDOUBLE_SIZE=12" |
| 246 | 241 | "${ARM_SOURCES}" |
| 247 | 242 | "" "" "" |
| 248 | 243 | ) |
| 249 | −make_tcc("" arm-vfp TCC_BUILD_ARM_VFP | |
| 244 | +make_tcc("" arm-linux-gnu TCC_BUILD_ARM_VFP | |
| 250 | 245 | "${ARM_DEFINITIONS};TCC_ARM_VFP" |
| 251 | 246 | "${ARM_SOURCES}" |
| 252 | 247 | "" "" "" |
| @@ -75,18 +75,30 @@ NATIVE_DEFINES += $(NATIVE_DEFINES_yes) · 74 unmodified lines | ||
| 75 | 75 | ifeq ($(TOP),.) |
| 76 | 76 | |
| 77 | 77 | PROGS=tcc$(EXESUF) |
| 78 | −I386_CROSS = i386-tcc$(EXESUF) | |
| 79 | −WIN32_CROSS = i386-win32-tcc$(EXESUF) | |
| 80 | −WIN64_CROSS = x86_64-win32-tcc$(EXESUF) | |
| 81 | −WINCE_CROSS = arm-win32-tcc$(EXESUF) | |
| 82 | −X64_CROSS = x86_64-tcc$(EXESUF) | |
| 83 | −ARM_FPA_CROSS = arm-fpa-tcc$(EXESUF) | |
| 84 | −ARM_FPA_LD_CROSS = arm-fpa-ld-tcc$(EXESUF) | |
| 85 | −ARM_VFP_CROSS = arm-vfp-tcc$(EXESUF) | |
| 86 | −ARM_EABI_CROSS = arm-eabi-tcc$(EXESUF) | |
| 78 | +I386_CROSS = i386-linux-gnu-tcc$(EXESUF) | |
| 79 | +WIN32_CROSS = i386-w64-mingw32-tcc$(EXESUF) | |
| 80 | +WIN64_CROSS = x86_64-w64-mingw32-tcc$(EXESUF) | |
| 81 | +WINCE_CROSS = arm-wince-mingw32ce-tcc$(EXESUF) | |
| 82 | +X64_CROSS = x86_64-linux-gnu-tcc$(EXESUF) | |
| 83 | +ARM_FPA_CROSS = arm-linux-fpa-tcc$(EXESUF) | |
| 84 | +ARM_FPA_LD_CROSS = arm-linux-fpa-ld-tcc$(EXESUF) | |
| 85 | +ARM_VFP_CROSS = arm-linux-gnu-tcc$(EXESUF) | |
| 86 | +ARM_EABI_CROSS = arm-linux-gnueabi-tcc$(EXESUF) | |
| 87 | +ARM_EABIHF_CROSS = arm-linux-gnueabihf-tcc$(EXESUF) | |
| 87 | 88 | ARM_CROSS = $(ARM_FPA_CROSS) $(ARM_FPA_LD_CROSS) $(ARM_VFP_CROSS) $(ARM_EABI_CROSS) |
| 88 | 89 | C67_CROSS = c67-tcc$(EXESUF) |
| 89 | 90 | |
| 91 | +# Legacy symlinks for cross compilers | |
| 92 | +$(I386_CROSS)_LINK = i386-tcc$(EXESUF) | |
| 93 | +$(WIN32_CROSS)_LINK = i386-win32-tcc$(EXESUF) | |
| 94 | +$(WIN64_CROSS)_LINK = x86_64-win32-tcc$(EXESUF) | |
| 95 | +$(WINCE_CROSS)_LINK = arm-win32-tcc$(EXESUF) | |
| 96 | +$(X64_CROSS)_LINK = x86_64-tcc$(EXESUF) | |
| 97 | +$(ARM_FPA_CROSS)_LINK = arm-fpa-tcc$(EXESUF) | |
| 98 | +$(ARM_FPA_LD_CROSS)_LINK = arm-fpa-ld-tcc$(EXESUF) | |
| 99 | +$(ARM_VFP_CROSS)_LINK = arm-vfp-tcc$(EXESUF) | |
| 100 | +$(ARM_EABI_CROSS)_LINK = arm-eabi-tcc$(EXESUF) | |
| 101 | + | |
| 90 | 102 | CORE_FILES = tcc.c libtcc.c tccpp.c tccgen.c tccelf.c tccasm.c tccrun.c |
| 91 | 103 | CORE_FILES += tcc.h config.h libtcc.h tcctok.h |
| 92 | 104 | I386_FILES = $(CORE_FILES) i386-gen.c i386-asm.c i386-asm.h i386-tok.h |
| @@ -124,6 +136,7 @@ NATIVE_FILES=$(ARM_FILES) · 31 unmodified lines | ||
| 124 | 136 | PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(C67_CROSS) |
| 125 | 137 | LIBTCC1=libtcc1.a |
| 126 | 138 | endif |
| 139 | +PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK)) | |
| 127 | 140 | |
| 128 | 141 | ifeq ($(TARGETOS),Darwin) |
| 129 | 142 | PROGS+=tiny_libmaker$(EXESUF) |
| @@ -150,6 +163,7 @@ tcc$(EXESUF): tcc.o $(LIBTCC) · 20 unmodified lines | ||
| 150 | 163 | # Cross Tiny C Compilers |
| 151 | 164 | %-tcc$(EXESUF): tcc.c |
| 152 | 165 | $(CC) -o $@ $< -DONE_SOURCE $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(LIBS) $(LDFLAGS) |
| 166 | + $(if $($@_LINK),ln -sf $@ $($@_LINK)) | |
| 153 | 167 | |
| 154 | 168 | # profiling version |
| 155 | 169 | tcc_p$(EXESUF): $(NATIVE_FILES) |
| @@ -237,7 +251,7 @@ ifndef CONFIG_WIN32 · 81 unmodified lines | ||
| 237 | 251 | install: $(PROGS) $(TCCLIBS) $(TCCDOCS) |
| 238 | 252 | mkdir -p "$(bindir)" |
| 239 | 253 | ifeq ($(CC),tcc) |
| 240 | − $(INSTALL) -m755 $(PROGS) "$(bindir)" | |
| 254 | + $(INSTALL) -m755 $(PROGS) $(PROGS_CROSS_LINK) "$(bindir)" | |
| 241 | 255 | else |
| 242 | 256 | $(INSTALLBIN) -m755 $(PROGS) "$(bindir)" |
| 243 | 257 | endif |