History

rename libtcc1.c

jiang committed 12 years ago

Commit ba61fd91 parent 5af0ea710 files · +47 −47Browse files

Unified · Split

10 files
  1. Makefile +25 −25
  2. lib/Makefile +8 −8
  3. lib/libcrt.c +0 −0
  4. tcc.h +1 −1
  5. tccelf.c +4 −4
  6. tccpe.c +1 −1
  7. tests/Makefile +5 −5
  8. tests/abitest.c +1 −1
  9. tests/libtcc_test.c +1 −1
  10. win32/tools/tiny_libmaker.c +1 −1
Makefile+25−25
@@ -22,7 +22,7 @@ endif · 21 unmodified lines
2222 endif
2323 else # not GCC
2424 ifeq (-$(findstring clang,$(CC))-,-clang-)
25−# make clang accept gnuisms in libtcc1.c
25+# make clang accept gnuisms in libcrt.c
2626 CFLAGS+=-fheinous-gnu-extensions
2727 endif
2828 endif
@@ -113,29 +113,29 @@ ifdef CONFIG_WIN64 · 84 unmodified lines
113113 PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF)
114114 NATIVE_FILES=$(WIN64_FILES)
115115 PROGS_CROSS=$(WIN32_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS)
116−LIBTCC1_CROSS=lib/i386-win32/libtcc1.a
117−LIBTCC1=libtcc1.a
116+LIBTCC1_CROSS=lib/i386-win32/libcrt.a
117+LIBCRT=libcrt.a
118118 else ifdef CONFIG_WIN32
119119 PROGS+=tiny_impdef$(EXESUF) tiny_libmaker$(EXESUF)
120120 NATIVE_FILES=$(WIN32_FILES)
121121 PROGS_CROSS=$(WIN64_CROSS) $(I386_CROSS) $(X64_CROSS) $(ARM_CROSS) $(C67_CROSS)
122−LIBTCC1_CROSS=lib/x86_64-win32/libtcc1.a
123−LIBTCC1=libtcc1.a
122+LIBTCC1_CROSS=lib/x86_64-win32/libcrt.a
123+LIBCRT=libcrt.a
124124 else ifeq ($(ARCH),i386)
125125 NATIVE_FILES=$(I386_FILES)
126126 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
128−LIBTCC1=libtcc1.a
127+LIBTCC1_CROSS=lib/i386-win32/libcrt.a lib/x86_64-win32/libcrt.a
128+LIBCRT=libcrt.a
129129 else ifeq ($(ARCH),x86-64)
130130 NATIVE_FILES=$(X86_64_FILES)
131131 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
133−LIBTCC1=libtcc1.a
132+LIBTCC1_CROSS=lib/i386-win32/libcrt.a lib/x86_64-win32/libcrt.a lib/i386/libcrt.a
133+LIBCRT=libcrt.a
134134 else ifeq ($(ARCH),arm)
135135 NATIVE_FILES=$(ARM_FILES)
136136 PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(C67_CROSS)
137−LIBTCC1=libtcc1.a
138−LIBTCC1_CROSS=lib/i386-win32/libtcc1.a lib/x86_64-win32/libtcc1.a lib/i386/libtcc1.a
137+LIBCRT=libcrt.a
138+LIBTCC1_CROSS=lib/i386-win32/libcrt.a lib/x86_64-win32/libcrt.a lib/i386/libcrt.a
139139 endif
140140 PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK))
141141
@@ -143,7 +143,7 @@ ifeq ($(TARGETOS),Darwin) · 1 unmodified line
143143 PROGS+=tiny_libmaker$(EXESUF)
144144 endif
145145
146−TCCLIBS = $(LIBTCC1) $(LIBTCC) $(LIBTCC_EXTRA)
146+TCCLIBS = $(LIBCRT) $(LIBTCC) $(LIBTCC_EXTRA)
147147 TCCDOCS = tcc.1 tcc-doc.html tcc-doc.info
148148
149149 ifdef CONFIG_CROSS
@@ -225,9 +225,9 @@ tiny_libmaker$(EXESUF): win32/tools/tiny_libmaker.c · 75 unmodified lines
225225 $(CC) -o $@ $< $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
226226
227227 # TinyCC runtime libraries
228−libtcc1.a : FORCE
228+libcrt.a : FORCE
229229 $(MAKE) -C lib native
230−lib/%/libtcc1.a : FORCE $(PROGS_CROSS)
230+lib/%/libcrt.a : FORCE $(PROGS_CROSS)
231231 $(MAKE) -C lib cross TARGET=$*
232232
233233 FORCE:
@@ -258,8 +258,8 @@ endif · 24 unmodified lines
258258 -$(INSTALL) -m644 tcc-doc.info "$(infodir)"
259259 mkdir -p "$(tccdir)"
260260 mkdir -p "$(tccdir)/include"
261−ifneq ($(LIBTCC1),)
262− $(INSTALL) -m644 $(LIBTCC1) "$(tccdir)"
261+ifneq ($(LIBCRT),)
262+ $(INSTALL) -m644 $(LIBCRT) "$(tccdir)"
263263 endif
264264 $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) $(top_srcdir)/tcclib.h "$(tccdir)/include"
265265 mkdir -p "$(libdir)"
@@ -277,19 +277,19 @@ ifdef CONFIG_CROSS · 11 unmodified lines
277277 mkdir -p "$(tccdir)/win32/lib/64"
278278 ifneq ($(ARCH),i386)
279279 mkdir -p "$(tccdir)/i386"
280− $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"
280+ $(INSTALL) -m644 lib/i386/libcrt.a "$(tccdir)/i386"
281281 cp -r "$(tccdir)/include" "$(tccdir)/i386"
282282 endif
283283 $(INSTALL) -m644 $(top_srcdir)/win32/lib/*.def "$(tccdir)/win32/lib"
284− $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32"
285− $(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/win32/lib/64"
284+ $(INSTALL) -m644 lib/i386-win32/libcrt.a "$(tccdir)/win32/lib/32"
285+ $(INSTALL) -m644 lib/x86_64-win32/libcrt.a "$(tccdir)/win32/lib/64"
286286 cp -r $(top_srcdir)/win32/include/. "$(tccdir)/win32/include"
287287 cp -r "$(tccdir)/include" "$(tccdir)/win32"
288288 endif
289289
290290 uninstall:
291291 rm -fv $(foreach P,$(PROGS),"$(bindir)/$P")
292− rm -fv $(foreach P,$(LIBTCC1),"$(tccdir)/$P")
292+ rm -fv $(foreach P,$(LIBCRT),"$(tccdir)/$P")
293293 rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P")
294294 rm -fv "$(tccdir)/include/tcclib.h"
295295 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
310310 mkdir -p "$(tccdir)/doc"
311311 mkdir -p "$(tccdir)/libtcc"
312312 $(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"
314314 cp -r $(top_srcdir)/win32/include/. "$(tccdir)/include"
315315 cp -r $(top_srcdir)/win32/examples/. "$(tccdir)/examples"
316316 $(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
320320 ifdef CONFIG_CROSS
321321 mkdir -p "$(tccdir)/lib/32"
322322 mkdir -p "$(tccdir)/lib/64"
323− -$(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/lib/32"
324− -$(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/lib/64"
323+ -$(INSTALL) -m644 lib/i386-win32/libcrt.a "$(tccdir)/lib/32"
324+ -$(INSTALL) -m644 lib/x86_64-win32/libcrt.a "$(tccdir)/lib/64"
325325 endif
326326
327327 uninstall:
@@ -340,7 +340,7 @@ tcc-doc.info: tcc-doc.texi · 12 unmodified lines
340340 -makeinfo $<
341341
342342 # in tests subdir
343−export LIBTCC1
343+export LIBCRT
344344
345345 %est:
346346 $(MAKE) -C tests $@ 'PROGS_CROSS=$(PROGS_CROSS)'
@@ -348,7 +348,7 @@ export LIBTCC1 · 1 unmodified line
348348 clean:
349349 rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.exe libtcc_test$(EXESUF)
350350 $(MAKE) -C tests $@
351−ifneq ($(LIBTCC1),)
351+ifneq ($(LIBCRT),)
352352 $(MAKE) -C lib $@
353353 endif
354354
lib/Makefile+8−8
@@ -1,5 +1,5 @@
11 #
2−# Tiny C Compiler Makefile for libtcc1.a
2+# Tiny C Compiler Makefile for libcrt.a
33 #
44
55 TOP = ..
@@ -38,15 +38,15 @@ endif · 32 unmodified lines
3838
3939 DIR = $(TARGET)
4040
41−native : ../libtcc1.a
42−cross : $(DIR)/libtcc1.a
41+native : ../libcrt.a
42+cross : $(DIR)/libcrt.a
4343
4444 native : TCC = $(TOP)/tcc$(EXESUF)
4545 cross : TCC = $(TOP)/$(TARGET)-tcc$(EXESUF)
4646
47−I386_O = libtcc1.o alloca86.o alloca86-bt.o $(BCHECK_O)
48−X86_64_O = libtcc1.o alloca86_64.o
49−ARM_O = libtcc1.o armeabi.o alloca-arm.o
47+I386_O = libcrt.o alloca86.o alloca86-bt.o $(BCHECK_O)
48+X86_64_O = libcrt.o alloca86_64.o
49+ARM_O = libcrt.o armeabi.o alloca-arm.o
5050 WIN32_O = $(I386_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
5151 WIN64_O = $(X86_64_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
5252
@@ -83,7 +83,7 @@ ifeq "$(TARGET)" "arm" · 30 unmodified lines
8383 TGT = -DTCC_TARGET_ARM
8484 XCC ?= $(TCC) -B$(TOP)
8585 else
86− $(error libtcc1.a not supported on target '$(TARGET)')
86+ $(error libcrt.a not supported on target '$(TARGET)')
8787 endif
8888 endif
8989 endif
@@ -102,7 +102,7 @@ ifdef XAR · 12 unmodified lines
102102 AR = $(XAR)
103103 endif
104104
105−$(DIR)/libtcc1.a ../libtcc1.a : $(OBJ) $(XAR)
105+$(DIR)/libcrt.a ../libcrt.a : $(OBJ) $(XAR)
106106 $(AR) rcs $@ $(OBJ)
107107 $(DIR)/%.o : %.c
108108 $(XCC) -c $< -o $@ $(XFLAGS)
lib/libcrt.crenamed from lib/libtcc1.c+0−0

File renamed without changes.

tcc.h+1−1
@@ -274,7 +274,7 @@ · 273 unmodified lines
274274 # define DEFAULT_ELFINTERP(s) default_elfinterp(s)
275275 #endif
276276
277−/* library to use with CONFIG_USE_LIBGCC instead of libtcc1.a */
277+/* library to use with CONFIG_USE_LIBGCC instead of libcrt.a */
278278 #define TCC_LIBGCC USE_MUADIR(CONFIG_SYSROOT "/" CONFIG_LDDIR) "/libgcc_s.so.1"
279279
280280 /* -------------------------------------------- */
tccelf.c+4−4
@@ -1443,16 +1443,16 @@ ST_FUNC void tcc_add_runtime(TCCState *s1) · 1442 unmodified lines
14431443 #ifdef CONFIG_USE_LIBGCC
14441444 if (!s1->static_link) {
14451445 tcc_add_file(s1, TCC_LIBGCC);
1446− tcc_add_support(s1, "libtcc1.a");
1446+ tcc_add_support(s1, "libcrt.a");
14471447 } else
1448− tcc_add_support(s1, "libtcc1.a");
1448+ tcc_add_support(s1, "libcrt.a");
14491449 #else
1450− tcc_add_support(s1, "libtcc1.a");
1450+ tcc_add_support(s1, "libcrt.a");
14511451 #endif
14521452 }
14531453
14541454 /* tcc_add_bcheck tries to relocate a call to __bound_init in _init so
1455− libtcc1.a must be loaded before for __bound_init to be defined and
1455+ libcrt.a must be loaded before for __bound_init to be defined and
14561456 crtn.o must be loaded after to not finalize _init too early. */
14571457 tcc_add_bcheck(s1);
14581458
tccpe.c+1−1
@@ -1773,7 +1773,7 @@ static void pe_add_runtime(TCCState *s1, struct pe_info *pe) · 1772 unmodified lines
17731773
17741774 if (0 == s1->nostdlib) {
17751775 static const char *libs[] = {
1776− "libtcc1.a", "msvcrt", "kernel32", "", "user32", "gdi32", NULL
1776+ "libcrt.a", "msvcrt", "kernel32", "", "user32", "gdi32", NULL
17771777 };
17781778 const char **pp, *p;
17791779 for (pp = libs; 0 != (p = *pp); ++pp) {
tests/Makefile+5−5
@@ -66,8 +66,8 @@ RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS) · 65 unmodified lines
6666 DISAS = objdump -d
6767
6868 # libtcc test
69−ifdef LIBTCC1
70− LIBTCC1:=$(TOP)/$(LIBTCC1)
69+ifdef LIBCRT
70+ LIBCRT:=$(TOP)/$(LIBCRT)
7171 endif
7272
7373 all test : $(TESTS)
@@ -89,7 +89,7 @@ hello-run: ../examples/ex1.c · 15 unmodified lines
8989 @echo ------------ $@ ------------
9090 $(TCC) -run $<
9191
92−libtest: libtcc_test$(EXESUF) $(LIBTCC1)
92+libtest: libtcc_test$(EXESUF) $(LIBCRT)
9393 @echo ------------ $@ ------------
9494 ./libtcc_test$(EXESUF) lib_path=..
9595
@@ -101,7 +101,7 @@ moretests: · 5 unmodified lines
101101 $(MAKE) -C tests2
102102
103103 w32-prep:
104− cp ../libtcc1.a ../lib
104+ cp ../libcrt.a ../lib
105105
106106 # test.ref - generate using cc
107107 test.ref: tcctest.c
@@ -242,4 +242,4 @@ clean: · 134 unmodified lines
242242 rm -vf *~ *.o *.a *.bin *.i *.ref *.out *.out? *.out?b *.cc \
243243 *-cc *-tcc *.exe \
244244 hello libtcc_test vla_test tcctest[1234] ex? tcc_g tcclib.h \
245− ../lib/libtcc1.a
245+ ../lib/libcrt.a
tests/abitest.c+1−1
@@ -468,7 +468,7 @@ int main(int argc, char **argv) { · 467 unmodified lines
468468 const char *testname = NULL;
469469 int retval = EXIT_SUCCESS;
470470
471− /* if tcclib.h and libtcc1.a are not installed, where can we find them */
471+ /* if tcclib.h and libcrt.a are not installed, where can we find them */
472472 for (i = 1; i < argc; ++i) {
473473 if (!memcmp(argv[i], "lib_path=",9))
474474 tccdir = argv[i] + 9;
tests/libtcc_test.c+1−1
@@ -43,7 +43,7 @@ int main(int argc, char **argv) · 42 unmodified lines
4343 exit(1);
4444 }
4545
46− /* if tcclib.h and libtcc1.a are not installed, where can we find them */
46+ /* if tcclib.h and libcrt.a are not installed, where can we find them */
4747 if (argc == 2 && !memcmp(argv[1], "lib_path=",9))
4848 tcc_set_lib_path(s, argv[1]+9);
4949
win32/tools/tiny_libmaker.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * This program is for making libtcc1.a without ar
2+ * This program is for making libcrt.a without ar
33 * tiny_libmaker - tiny elf lib maker
44 * usage: tiny_libmaker [lib] files...
55 * Copyright (c) 2007 Timppa

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