History

Use GNU triplet prefix for cross tcc compilers

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.

Thomas Preud'homme committed 12 years ago

Commit bf2854d1 parent 3352cb82 files · +34 −25Browse files

Unified · Split

2 files
  1. CMakeLists.txt +10 −15
  2. Makefile +24 −10
CMakeLists.txt+10−15
@@ -195,58 +195,53 @@ macro(make_tcc native_name cross_name cross_enabled definitions tcc_sources libt · 194 unmodified lines
195 endif()195 endif()
196endmacro()196endmacro()
197 197
198make_tcc("Win32" i386-win32 TCC_BUILD_WIN32198make_tcc("Win32" i386-w64-mingw32 TCC_BUILD_WIN32
199 "TCC_TARGET_I386;TCC_TARGET_PE"199 "TCC_TARGET_I386;TCC_TARGET_PE"
200 "${I386_SOURCES};tccpe.c"200 "${I386_SOURCES};tccpe.c"
201 tiny_libmaker_32 "${LIBTCC1_I386_SOURCES};${LIBTCC1_WIN_SOURCES}" "win32/include;win32/include/winapi"201 tiny_libmaker_32 "${LIBTCC1_I386_SOURCES};${LIBTCC1_WIN_SOURCES}" "win32/include;win32/include/winapi"
202)202)
203make_tcc("Win64" x86_64-win32 TCC_BUILD_WIN64203make_tcc("Win64" x86_64-w64-mingw32 TCC_BUILD_WIN64
204 "TCC_TARGET_X86_64;TCC_TARGET_PE"204 "TCC_TARGET_X86_64;TCC_TARGET_PE"
205 "${X86_64_SOURCES};tccpe.c"205 "${X86_64_SOURCES};tccpe.c"
206 tiny_libmaker_64 "lib/alloca86_64.S;${LIBTCC1_WIN_SOURCES}" "win32/include;win32/include/winapi"206 tiny_libmaker_64 "lib/alloca86_64.S;${LIBTCC1_WIN_SOURCES}" "win32/include;win32/include/winapi"
207)207)
208make_tcc("WinCE" arm-win32 TCC_BUILD_WINCE208make_tcc("WinCE" arm-wince-mingw32ce TCC_BUILD_WINCE
209 "TCC_TARGET_ARM;TCC_ARM_VERSION=${TCC_ARM_VERSION};TCC_TARGET_PE"209 "TCC_TARGET_ARM;TCC_ARM_VERSION=${TCC_ARM_VERSION};TCC_TARGET_PE"
210 "${ARM_SOURCES};tccpe.c"210 "${ARM_SOURCES};tccpe.c"
211 "" "" ""211 "" "" ""
212)212)
213make_tcc("i386" i386 TCC_BUILD_I386213make_tcc("i386" i386-linux-gnu TCC_BUILD_I386
214 TCC_TARGET_I386214 TCC_TARGET_I386
215 "${I386_SOURCES}"215 "${I386_SOURCES}"
216 tiny_libmaker_32 "${LIBTCC1_I386_SOURCES}" ""216 tiny_libmaker_32 "${LIBTCC1_I386_SOURCES}" ""
217)217)
218make_tcc("x86_64" x86_64 TCC_BUILD_X64218make_tcc("x86_64" x86_64-linux-gnu TCC_BUILD_X64
219 TCC_TARGET_X86_64219 TCC_TARGET_X86_64
220 "${X86_64_SOURCES}"220 "${X86_64_SOURCES}"
221 tiny_libmaker_64 "lib/alloca86_64.S" ""221 tiny_libmaker_64 "lib/alloca86_64.S" ""
222)222)
223set(ARM_DEFINITIONS TCC_TARGET_ARM TCC_ARM_VERSION=${TCC_ARM_VERSION})223set(ARM_DEFINITIONS TCC_TARGET_ARM TCC_ARM_VERSION=${TCC_ARM_VERSION})
224make_tcc("ARM" arm TCC_BUILD_ARM224make_tcc("" arm-linux-gnueabihf TCC_BUILD_ARM_EABIHF
225 "${ARM_DEFINITIONS};WITHOUT_LIBTCC"
226 "${ARM_SOURCES}"
227 "" "" ""
228)
229make_tcc("" arm-eabihf TCC_BUILD_ARM_EABIHF
230 "${ARM_DEFINITIONS};TCC_ARM_EABI;TCC_ARM_HARDFLOAT"225 "${ARM_DEFINITIONS};TCC_ARM_EABI;TCC_ARM_HARDFLOAT"
231 "${ARM_SOURCES}"226 "${ARM_SOURCES}"
232 "" "" ""227 "" "" ""
233)228)
234make_tcc("" arm-eabi TCC_BUILD_ARM_EABI229make_tcc("" arm-linux-gnueabi TCC_BUILD_ARM_EABI
235 "${ARM_DEFINITIONS};TCC_ARM_EABI"230 "${ARM_DEFINITIONS};TCC_ARM_EABI"
236 "${ARM_SOURCES}"231 "${ARM_SOURCES}"
237 "" "" ""232 "" "" ""
238)233)
239make_tcc("" arm-fpa TCC_BUILD_ARM_FPA234make_tcc("" arm-linux-fpa TCC_BUILD_ARM_FPA
240 "${ARM_DEFINITIONS}"235 "${ARM_DEFINITIONS}"
241 "${ARM_SOURCES}"236 "${ARM_SOURCES}"
242 "" "" ""237 "" "" ""
243)238)
244make_tcc("" arm-fpa-ld TCC_BUILD_ARM_FPA_LD239make_tcc("" arm-linux-fpa-ld TCC_BUILD_ARM_FPA_LD
245 "${ARM_DEFINITIONS};LDOUBLE_SIZE=12"240 "${ARM_DEFINITIONS};LDOUBLE_SIZE=12"
246 "${ARM_SOURCES}"241 "${ARM_SOURCES}"
247 "" "" ""242 "" "" ""
248)243)
249make_tcc("" arm-vfp TCC_BUILD_ARM_VFP244make_tcc("" arm-linux-gnu TCC_BUILD_ARM_VFP
250 "${ARM_DEFINITIONS};TCC_ARM_VFP"245 "${ARM_DEFINITIONS};TCC_ARM_VFP"
251 "${ARM_SOURCES}"246 "${ARM_SOURCES}"
252 "" "" ""247 "" "" ""
Makefile+24−10
@@ -75,18 +75,30 @@ NATIVE_DEFINES += $(NATIVE_DEFINES_yes) · 74 unmodified lines
75ifeq ($(TOP),.)75ifeq ($(TOP),.)
76 76
77PROGS=tcc$(EXESUF)77PROGS=tcc$(EXESUF)
78I386_CROSS = i386-tcc$(EXESUF)78I386_CROSS = i386-linux-gnu-tcc$(EXESUF)
79WIN32_CROSS = i386-win32-tcc$(EXESUF)79WIN32_CROSS = i386-w64-mingw32-tcc$(EXESUF)
80WIN64_CROSS = x86_64-win32-tcc$(EXESUF)80WIN64_CROSS = x86_64-w64-mingw32-tcc$(EXESUF)
81WINCE_CROSS = arm-win32-tcc$(EXESUF)81WINCE_CROSS = arm-wince-mingw32ce-tcc$(EXESUF)
82X64_CROSS = x86_64-tcc$(EXESUF)82X64_CROSS = x86_64-linux-gnu-tcc$(EXESUF)
83ARM_FPA_CROSS = arm-fpa-tcc$(EXESUF)83ARM_FPA_CROSS = arm-linux-fpa-tcc$(EXESUF)
84ARM_FPA_LD_CROSS = arm-fpa-ld-tcc$(EXESUF)84ARM_FPA_LD_CROSS = arm-linux-fpa-ld-tcc$(EXESUF)
85ARM_VFP_CROSS = arm-vfp-tcc$(EXESUF)85ARM_VFP_CROSS = arm-linux-gnu-tcc$(EXESUF)
86ARM_EABI_CROSS = arm-eabi-tcc$(EXESUF)86ARM_EABI_CROSS = arm-linux-gnueabi-tcc$(EXESUF)
87ARM_EABIHF_CROSS = arm-linux-gnueabihf-tcc$(EXESUF)
87ARM_CROSS = $(ARM_FPA_CROSS) $(ARM_FPA_LD_CROSS) $(ARM_VFP_CROSS) $(ARM_EABI_CROSS)88ARM_CROSS = $(ARM_FPA_CROSS) $(ARM_FPA_LD_CROSS) $(ARM_VFP_CROSS) $(ARM_EABI_CROSS)
88C67_CROSS = c67-tcc$(EXESUF)89C67_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
90CORE_FILES = tcc.c libtcc.c tccpp.c tccgen.c tccelf.c tccasm.c tccrun.c102CORE_FILES = tcc.c libtcc.c tccpp.c tccgen.c tccelf.c tccasm.c tccrun.c
91CORE_FILES += tcc.h config.h libtcc.h tcctok.h103CORE_FILES += tcc.h config.h libtcc.h tcctok.h
92I386_FILES = $(CORE_FILES) i386-gen.c i386-asm.c i386-asm.h i386-tok.h104I386_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
124PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(C67_CROSS)136PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(C67_CROSS)
125LIBTCC1=libtcc1.a137LIBTCC1=libtcc1.a
126endif138endif
139PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK))
127 140
128ifeq ($(TARGETOS),Darwin)141ifeq ($(TARGETOS),Darwin)
129PROGS+=tiny_libmaker$(EXESUF)142PROGS+=tiny_libmaker$(EXESUF)
@@ -150,6 +163,7 @@ tcc$(EXESUF): tcc.o $(LIBTCC) · 20 unmodified lines
150# Cross Tiny C Compilers163# Cross Tiny C Compilers
151%-tcc$(EXESUF): tcc.c164%-tcc$(EXESUF): tcc.c
152 $(CC) -o $@ $< -DONE_SOURCE $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(LIBS) $(LDFLAGS)165 $(CC) -o $@ $< -DONE_SOURCE $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(LIBS) $(LDFLAGS)
166 $(if $($@_LINK),ln -sf $@ $($@_LINK))
153 167
154# profiling version168# profiling version
155tcc_p$(EXESUF): $(NATIVE_FILES)169tcc_p$(EXESUF): $(NATIVE_FILES)
@@ -237,7 +251,7 @@ ifndef CONFIG_WIN32 · 81 unmodified lines
237install: $(PROGS) $(TCCLIBS) $(TCCDOCS)251install: $(PROGS) $(TCCLIBS) $(TCCDOCS)
238 mkdir -p "$(bindir)"252 mkdir -p "$(bindir)"
239ifeq ($(CC),tcc)253ifeq ($(CC),tcc)
240 $(INSTALL) -m755 $(PROGS) "$(bindir)"254 $(INSTALL) -m755 $(PROGS) $(PROGS_CROSS_LINK) "$(bindir)"
241else255else
242 $(INSTALLBIN) -m755 $(PROGS) "$(bindir)"256 $(INSTALLBIN) -m755 $(PROGS) "$(bindir)"
243endif257endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t