Unified · Split
| @@ -6,6 +6,7 @@ version 0.9.21: · 5 unmodified lines | |||
| 6 | - fixed assignment of const struct in struct | 6 | - fixed assignment of const struct in struct |
| 7 | - line comment fix (reported by Bertram Felgenhauer) | 7 | - line comment fix (reported by Bertram Felgenhauer) |
| 8 | - initial TMS320C67xx target support (TK) | 8 | - initial TMS320C67xx target support (TK) |
| 9 | - win32 configure | ||
| 9 | 10 | ||
| 10 | version 0.9.20: | 11 | version 0.9.20: |
| 11 | 12 | ||
| @@ -4,7 +4,10 @@ · 3 unmodified lines | |||
| 4 | include config.mak | 4 | include config.mak |
| 5 | 5 | ||
| 6 | CFLAGS=-O2 -g -Wall | 6 | CFLAGS=-O2 -g -Wall |
| 7 | ifndef CONFIG_WIN32 | ||
| 7 | LIBS=-ldl | 8 | LIBS=-ldl |
| 9 | BCHECK_O=bcheck.o | ||
| 10 | endif | ||
| 8 | CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC | 11 | CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC |
| 9 | LIBS_P= | 12 | LIBS_P= |
| 10 | 13 | ||
| @@ -17,11 +20,13 @@ endif · 6 unmodified lines | |||
| 17 | 20 | ||
| 18 | DISAS=objdump -d | 21 | DISAS=objdump -d |
| 19 | INSTALL=install | 22 | INSTALL=install |
| 20 | 23 | PROGS=tcc$(EXESUF) c67-tcc$(EXESUF) arm-tcc$(EXESUF) | |
| 21 | # run local version of tcc with local libraries and includes | 24 | # run local version of tcc with local libraries and includes |
| 22 | TCC=./tcc -B. -I. | 25 | TCC=./tcc -B. -I. |
| 23 | 26 | ||
| 24 | all: tcc libtcc1.a bcheck.o tcc-doc.html tcc.1 libtcc.a libtcc_test | 27 | all: $(PROGS) \ |
| 28 | libtcc1$(LIBSUF) $(BCHECK_O) tcc-doc.html tcc.1 libtcc$(LIBSUF) \ | ||
| 29 | libtcc_test$(EXESUF) | ||
| 25 | 30 | ||
| 26 | Makefile: config.mak | 31 | Makefile: config.mak |
| 27 | 32 | ||
| @@ -108,23 +113,23 @@ ex3: ex3.c · 80 unmodified lines | |||
| 108 | 113 | ||
| 109 | # Native Tiny C Compiler | 114 | # Native Tiny C Compiler |
| 110 | 115 | ||
| 111 | tcc_g: tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h Makefile | 116 | tcc_g$(EXESUF): tcc.c i386-gen.c tccelf.c tccasm.c i386-asm.c tcctok.h libtcc.h i386-asm.h Makefile |
| 112 | $(CC) $(CFLAGS) -o $@ $< $(LIBS) | 117 | $(CC) $(CFLAGS) -o $@ $< $(LIBS) |
| 113 | 118 | ||
| 114 | tcc: tcc_g Makefile | 119 | tcc$(EXESUF): tcc_g$(EXESUF) Makefile |
| 115 | strip -s -R .comment -R .note -o $@ $< | 120 | $(STRIP) -o $@ $< |
| 116 | 121 | ||
| 117 | c67-tcc: tcc.c c67-gen.c tccelf.c tccasm.c tcctok.h libtcc.h tcccoff.c Makefile | 122 | c67-tcc$(EXESUF): tcc.c c67-gen.c tccelf.c tccasm.c tcctok.h libtcc.h tcccoff.c Makefile |
| 118 | $(CC) $(CFLAGS) -DTCC_TARGET_C67 -o $@ $< $(LIBS) | 123 | $(CC) $(CFLAGS) -DTCC_TARGET_C67 -o $@ $< $(LIBS) |
| 119 | 124 | ||
| 120 | arm-tcc: tcc.c arm-gen.c tccelf.c tccasm.c tcctok.h libtcc.h Makefile | 125 | arm-tcc$(EXESUF): tcc.c arm-gen.c tccelf.c tccasm.c tcctok.h libtcc.h Makefile |
| 121 | $(CC) $(CFLAGS) -DTCC_TARGET_ARM -o $@ $< $(LIBS) | 126 | $(CC) $(CFLAGS) -DTCC_TARGET_ARM -o $@ $< $(LIBS) |
| 122 | 127 | ||
| 123 | # TinyCC runtime libraries | 128 | # TinyCC runtime libraries |
| 124 | libtcc1.o: libtcc1.c | 129 | libtcc1.o: libtcc1.c |
| 125 | $(CC) -O2 -Wall -c -o $@ $< | 130 | $(CC) -O2 -Wall -c -o $@ $< |
| 126 | 131 | ||
| 127 | libtcc1.a: libtcc1.o | 132 | libtcc1$(LIBSUF): libtcc1.o |
| 128 | $(AR) rcs $@ $^ | 133 | $(AR) rcs $@ $^ |
| 129 | 134 | ||
| 130 | bcheck.o: bcheck.c | 135 | bcheck.o: bcheck.c |
| @@ -132,52 +137,49 @@ bcheck.o: bcheck.c · 1 unmodified line | |||
| 132 | 137 | ||
| 133 | install: tcc_install libinstall | 138 | install: tcc_install libinstall |
| 134 | 139 | ||
| 135 | tcc_install: tcc tcc.1 libtcc1.a bcheck.o | 140 | tcc_install: $(PROGS) tcc.1 libtcc1$(LIBSUF) $(BCHECK_O) tcc-doc.html tcc.1 |
| 136 | mkdir -p $(bindir) | 141 | mkdir -p "$(bindir)" |
| 137 | $(INSTALL) -m755 tcc $(bindir) | 142 | $(INSTALL) -s -m755 $(PROGS) "$(bindir)" |
| 138 | mkdir -p $(mandir)/man1 | 143 | ifndef CONFIG_WIN32 |
| 139 | $(INSTALL) tcc.1 $(mandir)/man1 | 144 | mkdir -p "$(mandir)/man1" |
| 140 | mkdir -p $(libdir)/tcc | 145 | $(INSTALL) tcc.1 "$(mandir)/man1" |
| 141 | mkdir -p $(libdir)/tcc/include | 146 | endif |
| 142 | $(INSTALL) -m644 libtcc1.a bcheck.o $(libdir)/tcc | 147 | mkdir -p "$(libdir)/tcc" |
| 148 | mkdir -p "$(libdir)/tcc/include" | ||
| 149 | $(INSTALL) -m644 libtcc1$(LIBSUF) $(BCHECK_O) "$(libdir)/tcc" | ||
| 143 | $(INSTALL) -m644 stdarg.h stddef.h stdbool.h float.h varargs.h \ | 150 | $(INSTALL) -m644 stdarg.h stddef.h stdbool.h float.h varargs.h \ |
| 144 | tcclib.h $(libdir)/tcc/include | 151 | tcclib.h "$(libdir)/tcc/include" |
| 152 | mkdir -p "$(docdir)" | ||
| 153 | $(INSTALL) -m644 tcc-doc.html "$(docdir)" | ||
| 145 | 154 | ||
| 146 | clean: | 155 | clean: |
| 147 | rm -f *~ *.o tcc tcc1 tcct tcc_g tcctest.ref *.bin *.i ex2 \ | 156 | rm -f *~ *.o tcc tcc1 tcct tcc_g tcctest.ref *.bin *.i ex2 \ |
| 148 | core gmon.out test.out test.ref a.out tcc_p \ | 157 | core gmon.out test.out test.ref a.out tcc_p \ |
| 149 | *.exe tcc-doc.html tcc.pod tcc.1 libtcc.a libtcc_test \ | 158 | *.exe tcc-doc.html tcc.pod tcc.1 libtcc$(LIBSUF) libtcc_test \ |
| 150 | tcctest[1234] test[1234].out | 159 | tcctest[1234] test[1234].out c67-tcc arm-tcc |
| 151 | 160 | ||
| 152 | distclean: clean | 161 | distclean: clean |
| 153 | rm -f config.h config.mak config.texi | 162 | rm -f config.h config.mak config.texi |
| 154 | 163 | ||
| 155 | # win32 TCC | ||
| 156 | tcc_g.exe: tcc.c i386-gen.c bcheck.c Makefile | ||
| 157 | i386-mingw32msvc-gcc $(CFLAGS) -DCONFIG_TCC_STATIC -o $@ $< | ||
| 158 | |||
| 159 | tcc.exe: tcc_g.exe | ||
| 160 | i386-mingw32msvc-strip -o $@ $< | ||
| 161 | |||
| 162 | # profiling version | 164 | # profiling version |
| 163 | tcc_p: tcc.c Makefile | 165 | tcc_p: tcc.c Makefile |
| 164 | $(CC) $(CFLAGS_P) -o $@ $< $(LIBS_P) | 166 | $(CC) $(CFLAGS_P) -o $@ $< $(LIBS_P) |
| 165 | 167 | ||
| 166 | # libtcc generation and example | 168 | # libtcc generation and example |
| 167 | libinstall: libtcc.a | 169 | libinstall: libtcc$(LIBSUF) |
| 168 | mkdir -p $(libdir) | 170 | mkdir -p "$(libdir)" |
| 169 | $(INSTALL) -m644 libtcc.a $(libdir) | 171 | $(INSTALL) -m644 libtcc$(LIBSUF) "$(libdir)" |
| 170 | mkdir -p $(includedir) | 172 | mkdir -p "$(includedir)" |
| 171 | $(INSTALL) -m644 libtcc.h $(includedir) | 173 | $(INSTALL) -m644 libtcc.h "$(includedir)" |
| 172 | 174 | ||
| 173 | libtcc.o: tcc.c i386-gen.c bcheck.c Makefile | 175 | libtcc.o: tcc.c i386-gen.c Makefile |
| 174 | $(CC) $(CFLAGS) -DLIBTCC -c -o $@ $< | 176 | $(CC) $(CFLAGS) -DLIBTCC -c -o $@ $< |
| 175 | 177 | ||
| 176 | libtcc.a: libtcc.o | 178 | libtcc$(LIBSUF): libtcc.o |
| 177 | $(AR) rcs $@ $^ | 179 | $(AR) rcs $@ $^ |
| 178 | 180 | ||
| 179 | libtcc_test: libtcc_test.c libtcc.a | 181 | libtcc_test$(EXESUF): libtcc_test.c libtcc$(LIBSUF) |
| 180 | $(CC) $(CFLAGS) -I. -o $@ $< -L. -ltcc -ldl | 182 | $(CC) $(CFLAGS) -o $@ $< libtcc$(LIBSUF) $(LIBS) |
| 181 | 183 | ||
| 182 | libtest: libtcc_test | 184 | libtest: libtcc_test |
| 183 | ./libtcc_test | 185 | ./libtcc_test |
| @@ -226,7 +228,9 @@ FILES= Makefile Makefile.uClibc configure VERSION \ · 42 unmodified lines | |||
| 226 | README TODO COPYING \ | 228 | README TODO COPYING \ |
| 227 | Changelog tcc-doc.texi tcc-doc.html \ | 229 | Changelog tcc-doc.texi tcc-doc.html \ |
| 228 | tcc.1 \ | 230 | tcc.1 \ |
| 229 | tcc.c i386-gen.c tccelf.c tcctok.h tccasm.c i386-asm.c i386-asm.h\ | 231 | tcc.c tccelf.c tcctok.h tccasm.c i386-asm.c i386-asm.h \ |
| 232 | tcccoff.c coff.h \ | ||
| 233 | i386-gen.c c67-gen.c arm-gen.c \ | ||
| 230 | bcheck.c libtcc1.c \ | 234 | bcheck.c libtcc1.c \ |
| 231 | elf.h stab.h stab.def \ | 235 | elf.h stab.h stab.def \ |
| 232 | stddef.h stdarg.h stdbool.h float.h varargs.h \ | 236 | stddef.h stdarg.h stdbool.h float.h varargs.h \ |
| @@ -1 +1 @@ | |||
| 1 | 0.9.20 | 1 | 0.9.21 |
| @@ -18,7 +18,7 @@ TMPS="${TMPDIR1}/tcc-conf-${RANDOM}-$$-${RANDOM}.S" · 17 unmodified lines | |||
| 18 | TMPH="${TMPDIR1}/tcc-conf-${RANDOM}-$$-${RANDOM}.h" | 18 | TMPH="${TMPDIR1}/tcc-conf-${RANDOM}-$$-${RANDOM}.h" |
| 19 | 19 | ||
| 20 | # default parameters | 20 | # default parameters |
| 21 | prefix="/usr/local" | 21 | prefix="" |
| 22 | execprefix="" | 22 | execprefix="" |
| 23 | bindir="" | 23 | bindir="" |
| 24 | libdir="" | 24 | libdir="" |
| @@ -56,10 +56,16 @@ case "$cpu" in · 31 unmodified lines | |||
| 56 | esac | 56 | esac |
| 57 | gprof="no" | 57 | gprof="no" |
| 58 | bigendian="no" | 58 | bigendian="no" |
| 59 | mingw32="no" | ||
| 60 | LIBSUF=".a" | ||
| 61 | EXESUF="" | ||
| 59 | 62 | ||
| 60 | # OS specific | 63 | # OS specific |
| 61 | targetos=`uname -s` | 64 | targetos=`uname -s` |
| 62 | case $targetos in | 65 | case $targetos in |
| 66 | MINGW32*) | ||
| 67 | mingw32="yes" | ||
| 68 | ;; | ||
| 63 | *) ;; | 69 | *) ;; |
| 64 | esac | 70 | esac |
| 65 | 71 | ||
| @@ -106,6 +112,8 @@ for opt do · 40 unmodified lines | |||
| 106 | ;; | 112 | ;; |
| 107 | --enable-gprof) gprof="yes" | 113 | --enable-gprof) gprof="yes" |
| 108 | ;; | 114 | ;; |
| 115 | --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" | ||
| 116 | ;; | ||
| 109 | esac | 117 | esac |
| 110 | done | 118 | done |
| 111 | 119 | ||
| @@ -118,6 +126,11 @@ cc="${cross_prefix}${cc}" · 6 unmodified lines | |||
| 118 | ar="${cross_prefix}${ar}" | 126 | ar="${cross_prefix}${ar}" |
| 119 | strip="${cross_prefix}${strip}" | 127 | strip="${cross_prefix}${strip}" |
| 120 | 128 | ||
| 129 | if test "$mingw32" = "yes" ; then | ||
| 130 | LIBSUF=".lib" | ||
| 131 | EXESUF=".exe" | ||
| 132 | fi | ||
| 133 | |||
| 121 | if test -z "$cross_prefix" ; then | 134 | if test -z "$cross_prefix" ; then |
| 122 | 135 | ||
| 123 | # --- | 136 | # --- |
| @@ -188,26 +201,43 @@ echo "" · 64 unmodified lines | |||
| 188 | exit 1 | 201 | exit 1 |
| 189 | fi | 202 | fi |
| 190 | 203 | ||
| 191 | if test x"$execprefix" = x""; then | 204 | if test "$mingw32" = "yes" ; then |
| 192 | execprefix="${prefix}" | 205 | if test -z "$prefix" ; then |
| 193 | fi | 206 | prefix="/c/Program Files/tcc" |
| 194 | if test x"$bindir" = x""; then | 207 | fi |
| 195 | bindir="${execprefix}/bin" | 208 | execprefix="$prefix" |
| 196 | fi | 209 | bindir="$prefix" |
| 210 | docdir="$prefix/doc" | ||
| 211 | else | ||
| 212 | if test -z "$prefix" ; then | ||
| 213 | prefix="/usr/local" | ||
| 214 | fi | ||
| 215 | if test x"$execprefix" = x""; then | ||
| 216 | execprefix="${prefix}" | ||
| 217 | fi | ||
| 218 | if test x"$bindir" = x""; then | ||
| 219 | bindir="${execprefix}/bin" | ||
| 220 | fi | ||
| 221 | if test x"$docdir" = x""; then | ||
| 222 | docdir="$prefix/share/doc/qemu" | ||
| 223 | fi | ||
| 224 | fi # mingw32 | ||
| 225 | |||
| 197 | if test x"$libdir" = x""; then | 226 | if test x"$libdir" = x""; then |
| 198 | libdir="${execprefix}/lib" | 227 | libdir="${execprefix}/lib" |
| 199 | fi | 228 | fi |
| 200 | if test x"$includedir" = x""; then | ||
| 201 | includedir="${prefix}/include" | ||
| 202 | fi | ||
| 203 | if test x"$mandir" = x""; then | 229 | if test x"$mandir" = x""; then |
| 204 | mandir="${prefix}/man" | 230 | mandir="${prefix}/man" |
| 205 | fi | 231 | fi |
| 232 | if test x"$includedir" = x""; then | ||
| 233 | includedir="${prefix}/include" | ||
| 234 | fi | ||
| 206 | 235 | ||
| 207 | echo "Binary directory $bindir" | 236 | echo "Binary directory $bindir" |
| 208 | echo "Library directory $libdir" | 237 | echo "Library directory $libdir" |
| 209 | echo "Include directory $includedir" | 238 | echo "Include directory $includedir" |
| 210 | echo "Manual directory $mandir" | 239 | echo "Manual directory $mandir" |
| 240 | echo "Doc directory $docdir" | ||
| 211 | echo "Source path $source_path" | 241 | echo "Source path $source_path" |
| 212 | echo "C compiler $cc" | 242 | echo "C compiler $cc" |
| 213 | echo "make $make" | 243 | echo "make $make" |
| @@ -225,6 +255,7 @@ echo "bindir=$bindir" >> config.mak · 11 unmodified lines | |||
| 225 | echo "libdir=$libdir" >> config.mak | 255 | echo "libdir=$libdir" >> config.mak |
| 226 | echo "includedir=$includedir" >> config.mak | 256 | echo "includedir=$includedir" >> config.mak |
| 227 | echo "mandir=$mandir" >> config.mak | 257 | echo "mandir=$mandir" >> config.mak |
| 258 | echo "docdir=$docdir" >> config.mak | ||
| 228 | echo "#define CONFIG_TCC_LIBDIR \"$libdir\"" >> $TMPH | 259 | echo "#define CONFIG_TCC_LIBDIR \"$libdir\"" >> $TMPH |
| 229 | echo "MAKE=$make" >> config.mak | 260 | echo "MAKE=$make" >> config.mak |
| 230 | echo "CC=$cc" >> config.mak | 261 | echo "CC=$cc" >> config.mak |
| @@ -235,6 +266,8 @@ echo "AR=$ar" >> config.mak · 4 unmodified lines | |||
| 235 | echo "STRIP=$strip -s -R .comment -R .note" >> config.mak | 266 | echo "STRIP=$strip -s -R .comment -R .note" >> config.mak |
| 236 | echo "CFLAGS=$CFLAGS" >> config.mak | 267 | echo "CFLAGS=$CFLAGS" >> config.mak |
| 237 | echo "LDFLAGS=$LDFLAGS" >> config.mak | 268 | echo "LDFLAGS=$LDFLAGS" >> config.mak |
| 269 | echo "LIBSUF=$LIBSUF" >> config.mak | ||
| 270 | echo "EXESUF=$EXESUF" >> config.mak | ||
| 238 | if test "$cpu" = "x86" ; then | 271 | if test "$cpu" = "x86" ; then |
| 239 | echo "ARCH=i386" >> config.mak | 272 | echo "ARCH=i386" >> config.mak |
| 240 | echo "#define HOST_I386 1" >> $TMPH | 273 | echo "#define HOST_I386 1" >> $TMPH |
| @@ -257,6 +290,10 @@ else · 16 unmodified lines | |||
| 257 | echo "Unsupported CPU" | 290 | echo "Unsupported CPU" |
| 258 | exit 1 | 291 | exit 1 |
| 259 | fi | 292 | fi |
| 293 | if test "$mingw32" = "yes" ; then | ||
| 294 | echo "CONFIG_WIN32=yes" >> config.mak | ||
| 295 | echo "#define CONFIG_WIN32 1" >> $TMPH | ||
| 296 | fi | ||
| 260 | if test "$bigendian" = "yes" ; then | 297 | if test "$bigendian" = "yes" ; then |
| 261 | echo "WORDS_BIGENDIAN=yes" >> config.mak | 298 | echo "WORDS_BIGENDIAN=yes" >> config.mak |
| 262 | echo "#define WORDS_BIGENDIAN 1" >> $TMPH | 299 | echo "#define WORDS_BIGENDIAN 1" >> $TMPH |
| @@ -6,7 +6,7 @@ · 5 unmodified lines | |||
| 6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
| 7 | #include <stdio.h> | 7 | #include <stdio.h> |
| 8 | 8 | ||
| 9 | #include <libtcc.h> | 9 | #include "libtcc.h" |
| 10 | 10 | ||
| 11 | /* this function is called by the generated code */ | 11 | /* this function is called by the generated code */ |
| 12 | int add(int a, int b) | 12 | int add(int a, int b) |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include <time.h> | 34 | #include <time.h> |
| 35 | #ifdef WIN32 | 35 | #ifdef WIN32 |
| 36 | #include <sys/timeb.h> | 36 | #include <sys/timeb.h> |
| 37 | #define CONFIG_TCC_STATIC | ||
| 37 | #endif | 38 | #endif |
| 38 | #ifndef WIN32 | 39 | #ifndef WIN32 |
| 39 | #include <sys/time.h> | 40 | #include <sys/time.h> |
| @@ -85,13 +86,11 @@ · 45 unmodified lines | |||
| 85 | #define TCC_TARGET_COFF | 86 | #define TCC_TARGET_COFF |
| 86 | #endif | 87 | #endif |
| 87 | 88 | ||
| 88 | #if !defined(WIN32) | ||
| 89 | #define FALSE 0 | 89 | #define FALSE 0 |
| 90 | #define false 0 | 90 | #define false 0 |
| 91 | #define TRUE 1 | 91 | #define TRUE 1 |
| 92 | #define true 1 | 92 | #define true 1 |
| 93 | typedef int BOOL; | 93 | typedef int BOOL; |
| 94 | #endif | ||
| 95 | 94 | ||
| 96 | /* path to find crt1.o, crti.o and crtn.o. Only needed when generating | 95 | /* path to find crt1.o, crti.o and crtn.o. Only needed when generating |
| 97 | executables or dlls */ | 96 | executables or dlls */ |