| @@ -22,7 +22,7 @@ endif · 21 unmodified lines |
| 22 | endif | 22 | endif |
| 23 | else # not GCC | 23 | else # not GCC |
| 24 | ifeq (-$(findstring clang,$(CC))-,-clang-) | 24 | ifeq (-$(findstring clang,$(CC))-,-clang-) |
| 25 | # make clang accept gnuisms in libtcc1.c | 25 | # make clang accept gnuisms in libcrt.c |
| 26 | CFLAGS+=-fheinous-gnu-extensions | 26 | CFLAGS+=-fheinous-gnu-extensions |
| 27 | endif | 27 | endif |
| 28 | endif | 28 | endif |
| @@ -113,29 +113,29 @@ ifdef CONFIG_WIN64 · 84 unmodified lines |
| 113 | PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) | 113 | PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) |
| 114 | NATIVE_FILES=$(WIN64_FILES) | 114 | NATIVE_FILES=$(WIN64_FILES) |
| 115 | PROGS_CROSS=$(WIN32_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS) | 115 | PROGS_CROSS=$(WIN32_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS) |
| 116 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a | 116 | LIBTCC1_CROSS=lib/i386-win32/libcrt.a |
| 117 | LIBTCC1=libtcc1.a | 117 | LIBCRT=libcrt.a |
| 118 | else ifdef CONFIG_WIN32 | 118 | else ifdef CONFIG_WIN32 |
| 119 | PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) | 119 | PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF) |
| 120 | NATIVE_FILES=$(WIN32_FILES) | 120 | NATIVE_FILES=$(WIN32_FILES) |
| 121 | PROGS_CROSS=$(WIN64_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS) | 121 | PROGS_CROSS=$(WIN64_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS) |
| 122 | LIBTCC1_CROSS=lib/x86_64-win32/libtcc1.a | 122 | LIBTCC1_CROSS=lib/x86_64-win32/libcrt.a |
| 123 | LIBTCC1=libtcc1.a | 123 | LIBCRT=libcrt.a |
| 124 | else ifeq ($(ARCH),i386) | 124 | else ifeq ($(ARCH),i386) |
| 125 | NATIVE_FILES=$(I386_FILES) | 125 | NATIVE_FILES=$(I386_FILES) |
| 126 | PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) | 126 | PROGS_CROSS=$(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) |
| 127 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a | 127 | LIBTCC1_CROSS=lib/i386-win32/libcrt.a lib/x86_64-win32/libcrt.a |
| 128 | LIBTCC1=libtcc1.a | 128 | LIBCRT=libcrt.a |
| 129 | else ifeq ($(ARCH),x86-64) | 129 | else ifeq ($(ARCH),x86-64) |
| 130 | NATIVE_FILES=$(X86_64_FILES) | 130 | NATIVE_FILES=$(X86_64_FILES) |
| 131 | PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) | 131 | PROGS_CROSS=$(I386_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM_CROSS) $(C67_CROSS) |
| 132 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a lib/i386/libtcc1.a | 132 | LIBTCC1_CROSS=lib/i386-win32/libcrt.a lib/x86_64-win32/libcrt.a lib/i386/libcrt.a |
| 133 | LIBTCC1=libtcc1.a | 133 | LIBCRT=libcrt.a |
| 134 | else ifeq ($(ARCH),arm) | 134 | else ifeq ($(ARCH),arm) |
| 135 | NATIVE_FILES=$(ARM_FILES) | 135 | NATIVE_FILES=$(ARM_FILES) |
| 136 | PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(C67_CROSS) | 136 | PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(C67_CROSS) |
| 137 | LIBTCC1=libtcc1.a | 137 | LIBCRT=libcrt.a |
| 138 | LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a lib/i386/libtcc1.a | 138 | LIBTCC1_CROSS=lib/i386-win32/libcrt.a lib/x86_64-win32/libcrt.a lib/i386/libcrt.a |
| 139 | endif | 139 | endif |
| 140 | PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK)) | 140 | PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK)) |
| 141 | | 141 | |
| @@ -143,7 +143,7 @@ ifeq ($(TARGETOS),Darwin) · 1 unmodified line |
| 143 | PROGS+=tiny_libmaker$(EXESUF) | 143 | PROGS+=tiny_libmaker$(EXESUF) |
| 144 | endif | 144 | endif |
| 145 | | 145 | |
| 146 | TCCLIBS = $(LIBTCC1) $(LIBTCC) $(LIBTCC_EXTRA) | 146 | TCCLIBS = $(LIBCRT) $(LIBTCC) $(LIBTCC_EXTRA) |
| 147 | TCCDOCS = tcc.1 tcc-doc.html tcc-doc.info | 147 | TCCDOCS = tcc.1 tcc-doc.html tcc-doc.info |
| 148 | | 148 | |
| 149 | ifdef CONFIG_CROSS | 149 | ifdef CONFIG_CROSS |
| @@ -225,9 +225,9 @@ tiny_libmaker$(EXESUF): win32/tools/tiny_libmaker.c · 75 unmodified lines |
| 225 | $(CC) -o $@ $< $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) | 225 | $(CC) -o $@ $< $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) |
| 226 | | 226 | |
| 227 | # TinyCC runtime libraries | 227 | # TinyCC runtime libraries |
| 228 | libtcc1.a : FORCE | 228 | libcrt.a : FORCE |
| 229 | $(MAKE) -C lib native | 229 | $(MAKE) -C lib native |
| 230 | lib/%/libtcc1.a : FORCE $(PROGS_CROSS) | 230 | lib/%/libcrt.a : FORCE $(PROGS_CROSS) |
| 231 | $(MAKE) -C lib cross TARGET=$* | 231 | $(MAKE) -C lib cross TARGET=$* |
| 232 | | 232 | |
| 233 | FORCE: | 233 | FORCE: |
| @@ -258,8 +258,8 @@ endif · 24 unmodified lines |
| 258 | -$(INSTALL) -m644 tcc-doc.info "$(infodir)" | 258 | -$(INSTALL) -m644 tcc-doc.info "$(infodir)" |
| 259 | mkdir -p "$(tccdir)" | 259 | mkdir -p "$(tccdir)" |
| 260 | mkdir -p "$(tccdir)/include" | 260 | mkdir -p "$(tccdir)/include" |
| 261 | ifneq ($(LIBTCC1),) | 261 | ifneq ($(LIBCRT),) |
| 262 | $(INSTALL) -m644 $(LIBTCC1) "$(tccdir)" | 262 | $(INSTALL) -m644 $(LIBCRT) "$(tccdir)" |
| 263 | endif | 263 | endif |
| 264 | $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) $(top_srcdir)/tcclib.h "$(tccdir)/include" | 264 | $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) $(top_srcdir)/tcclib.h "$(tccdir)/include" |
| 265 | mkdir -p "$(libdir)" | 265 | mkdir -p "$(libdir)" |
| @@ -277,19 +277,19 @@ ifdef CONFIG_CROSS · 11 unmodified lines |
| 277 | mkdir -p "$(tccdir)/win32/lib/64" | 277 | mkdir -p "$(tccdir)/win32/lib/64" |
| 278 | ifneq ($(ARCH),i386) | 278 | ifneq ($(ARCH),i386) |
| 279 | mkdir -p "$(tccdir)/i386" | 279 | mkdir -p "$(tccdir)/i386" |
| 280 | $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386" | 280 | $(INSTALL) -m644 lib/i386/libcrt.a "$(tccdir)/i386" |
| 281 | cp -r "$(tccdir)/include" "$(tccdir)/i386" | 281 | cp -r "$(tccdir)/include" "$(tccdir)/i386" |
| 282 | endif | 282 | endif |
| 283 | $(INSTALL) -m644 $(top_srcdir)/win32/lib/*.def "$(tccdir)/win32/lib" | 283 | $(INSTALL) -m644 $(top_srcdir)/win32/lib/*.def "$(tccdir)/win32/lib" |
| 284 | $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32" | 284 | $(INSTALL) -m644 lib/i386-win32/libcrt.a "$(tccdir)/win32/lib/32" |
| 285 | $(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/win32/lib/64" | 285 | $(INSTALL) -m644 lib/x86_64-win32/libcrt.a "$(tccdir)/win32/lib/64" |
| 286 | cp -r $(top_srcdir)/win32/include/. "$(tccdir)/win32/include" | 286 | cp -r $(top_srcdir)/win32/include/. "$(tccdir)/win32/include" |
| 287 | cp -r "$(tccdir)/include" "$(tccdir)/win32" | 287 | cp -r "$(tccdir)/include" "$(tccdir)/win32" |
| 288 | endif | 288 | endif |
| 289 | | 289 | |
| 290 | uninstall: | 290 | uninstall: |
| 291 | rm -fv $(foreach P,$(PROGS),"$(bindir)/$P") | 291 | rm -fv $(foreach P,$(PROGS),"$(bindir)/$P") |
| 292 | rm -fv $(foreach P,$(LIBTCC1),"$(tccdir)/$P") | 292 | rm -fv $(foreach P,$(LIBCRT),"$(tccdir)/$P") |
| 293 | rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P") | 293 | rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P") |
| 294 | rm -fv "$(tccdir)/include/tcclib.h" | 294 | rm -fv "$(tccdir)/include/tcclib.h" |
| 295 | rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1" "$(infodir)/tcc-doc.info" | 295 | rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1" "$(infodir)/tcc-doc.info" |
| @@ -310,7 +310,7 @@ install: $(PROGS) $(TCCLIBS) $(TCCDOCS) · 14 unmodified lines |
| 310 | mkdir -p "$(tccdir)/doc" | 310 | mkdir -p "$(tccdir)/doc" |
| 311 | mkdir -p "$(tccdir)/libtcc" | 311 | mkdir -p "$(tccdir)/libtcc" |
| 312 | $(INSTALLBIN) -m755 $(PROGS) "$(tccdir)" | 312 | $(INSTALLBIN) -m755 $(PROGS) "$(tccdir)" |
| 313 | $(INSTALL) -m644 $(LIBTCC1) $(top_srcdir)/win32/lib/*.def "$(tccdir)/lib" | 313 | $(INSTALL) -m644 $(LIBCRT) $(top_srcdir)/win32/lib/*.def "$(tccdir)/lib" |
| 314 | cp -r $(top_srcdir)/win32/include/. "$(tccdir)/include" | 314 | cp -r $(top_srcdir)/win32/include/. "$(tccdir)/include" |
| 315 | cp -r $(top_srcdir)/win32/examples/. "$(tccdir)/examples" | 315 | cp -r $(top_srcdir)/win32/examples/. "$(tccdir)/examples" |
| 316 | $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) $(top_srcdir)/tcclib.h "$(tccdir)/include" | 316 | $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) $(top_srcdir)/tcclib.h "$(tccdir)/include" |
| @@ -320,8 +320,8 @@ install: $(PROGS) $(TCCLIBS) $(TCCDOCS) · 3 unmodified lines |
| 320 | ifdef CONFIG_CROSS | 320 | ifdef CONFIG_CROSS |
| 321 | mkdir -p "$(tccdir)/lib/32" | 321 | mkdir -p "$(tccdir)/lib/32" |
| 322 | mkdir -p "$(tccdir)/lib/64" | 322 | mkdir -p "$(tccdir)/lib/64" |
| 323 | -$(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/lib/32" | 323 | -$(INSTALL) -m644 lib/i386-win32/libcrt.a "$(tccdir)/lib/32" |
| 324 | -$(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/lib/64" | 324 | -$(INSTALL) -m644 lib/x86_64-win32/libcrt.a "$(tccdir)/lib/64" |
| 325 | endif | 325 | endif |
| 326 | | 326 | |
| 327 | uninstall: | 327 | uninstall: |
| @@ -340,7 +340,7 @@ tcc-doc.info: tcc-doc.texi · 12 unmodified lines |
| 340 | -makeinfo $< | 340 | -makeinfo $< |
| 341 | | 341 | |
| 342 | # in tests subdir | 342 | # in tests subdir |
| 343 | export LIBTCC1 | 343 | export LIBCRT |
| 344 | | 344 | |
| 345 | %est: | 345 | %est: |
| 346 | $(MAKE) -C tests $@ 'PROGS_CROSS=$(PROGS_CROSS)' | 346 | $(MAKE) -C tests $@ 'PROGS_CROSS=$(PROGS_CROSS)' |
| @@ -348,7 +348,7 @@ export LIBTCC1 · 1 unmodified line |
| 348 | clean: | 348 | clean: |
| 349 | rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.exe libtcc_test$(EXESUF) | 349 | rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.exe libtcc_test$(EXESUF) |
| 350 | $(MAKE) -C tests $@ | 350 | $(MAKE) -C tests $@ |
| 351 | ifneq ($(LIBTCC1),) | 351 | ifneq ($(LIBCRT),) |
| 352 | $(MAKE) -C lib $@ | 352 | $(MAKE) -C lib $@ |
| 353 | endif | 353 | endif |
| 354 | | 354 | |