sigrid/tinycc

configure+35−124

@@ -31,7 +31,6 @@ includedir="" · 30 unmodified lines
31	mandir=""	31	mandir=""
32	infodir=""	32	infodir=""
33	sysroot=""	33	sysroot=""
34	multiarch_triplet=""
35	cross_prefix=""	34	cross_prefix=""
36	cc="gcc"	35	cc="gcc"
37	host_cc="gcc"	36	host_cc="gcc"
@@ -121,8 +120,6 @@ for opt do · 83 unmodified lines
121	;;	120	;;
122	--sysroot=*) sysroot=`echo $opt \| cut -d '=' -f 2`	121	--sysroot=*) sysroot=`echo $opt \| cut -d '=' -f 2`
123	;;	122	;;
124	--multiarch-triplet=*) multiarch_triplet=`echo $opt \| cut -d '=' -f 2`
125	;;
126	--source-path=*) source_path=`echo $opt \| cut -d '=' -f 2`	123	--source-path=*) source_path=`echo $opt \| cut -d '=' -f 2`
127	;;	124	;;
128	--cross-prefix=*) cross_prefix=`echo $opt \| cut -d '=' -f 2`	125	--cross-prefix=*) cross_prefix=`echo $opt \| cut -d '=' -f 2`
@@ -238,37 +235,36 @@ Options: [defaults in brackets after descriptions] · 109 unmodified lines
238		235
239	EOF	236	EOF
240	echo "Standard options:"	237	echo "Standard options:"
241	echo " --help print this message"	238	echo " --help print this message"
242	echo " --prefix=PREFIX install in PREFIX [$prefix]"	239	echo " --prefix=PREFIX install in PREFIX [$prefix]"
243	echo " --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX"	240	echo " --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX"
244	echo " [same as prefix]"	241	echo " [same as prefix]"
245	echo " --bindir=DIR user executables in DIR [EPREFIX/bin]"	242	echo " --bindir=DIR user executables in DIR [EPREFIX/bin]"
246	echo " --libdir=DIR object code libraries in DIR [EPREFIX/lib]"	243	echo " --libdir=DIR object code libraries in DIR [EPREFIX/lib]"
247	echo " --tccdir=DIR installation directory [EPREFIX/lib/tcc]"	244	echo " --tccdir=DIR installation directory [EPREFIX/lib/tcc]"
248	echo " --includedir=DIR C header files in DIR [PREFIX/include]"	245	echo " --includedir=DIR C header files in DIR [PREFIX/include]"
249	echo " --sharedir=DIR documentation root DIR [PREFIX]/share"	246	echo " --sharedir=DIR documentation root DIR [PREFIX]/share"
250	echo " --docdir=DIR documentation in DIR [SHAREDIR/doc/tcc]"	247	echo " --docdir=DIR documentation in DIR [SHAREDIR/doc/tcc]"
251	echo " --mandir=DIR man documentation in DIR [SHAREDIR/man]"	248	echo " --mandir=DIR man documentation in DIR [SHAREDIR/man]"
252	echo " --infodir=DIR info documentation in DIR [SHAREDIR/info]"	249	echo " --infodir=DIR info documentation in DIR [SHAREDIR/info]"
253	echo ""	250	echo ""
254	echo "Advanced options (experts only):"	251	echo "Advanced options (experts only):"
255	echo " --source-path=PATH path of source code [$source_path]"	252	echo " --source-path=PATH path of source code [$source_path]"
256	echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"	253	echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
257	echo " --sysroot=PREFIX prepend PREFIX to library/include paths []"	254	echo " --sysroot=PREFIX prepend PREFIX to library/include paths []"
258	echo " --multiarch-triplet=SUFFIX append SUFFIX to library/include paths []"	255	echo " --cc=CC use C compiler CC [$cc]"
259	echo " --cc=CC use C compiler CC [$cc]"	256	echo " --disable-static make libtcc.so instead of libtcc.a"
260	echo " --disable-static make libtcc.so instead of libtcc.a"	257	echo " --disable-rpath disable use of -rpath with the above"
261	echo " --disable-rpath disable use of -rpath with the above"	258	echo " --strip-binaries strip symbol tables from resulting binaries"
262	echo " --strip-binaries strip symbol tables from resulting binaries"	259	echo " --with-libgcc use /lib/libgcc_s.so.1 instead of libtcc.a"
263	echo " --with-libgcc use /lib/libgcc_s.so.1 instead of libtcc.a"	260	echo " --enable-mingw32 build windows version on linux with mingw32"
264	echo " --enable-mingw32 build windows version on linux with mingw32"	261	echo " --enable-cygwin build windows version on windows with cygwin"
265	echo " --enable-cygwin build windows version on windows with cygwin"	262	echo " [requires cygwin and mingw32-make]"
266	echo " [requires cygwin and mingw32-make]"	263	echo " --enable-cross build cross compilers"
267	echo " --enable-cross build cross compilers"	264	echo " --extra-cflags= extra compiler flags"
268	echo " --extra-cflags= extra compiler flags"	265	echo " --extra-ldflags= extra linker options"
269	echo " --extra-ldflags= extra linker options"	266	echo " --with-selinux use mmap instead of exec mem"
270	echo " --with-selinux use mmap instead of exec mem"	267	echo " [requires write access to /tmp]"
271	echo " [requires write access to /tmp]"
272	echo ""	268	echo ""
273	#echo "NOTE: The object files are build at the place where configure is launched"	269	#echo "NOTE: The object files are build at the place where configure is launched"
274	exit 1	270	exit 1
@@ -334,14 +330,13 @@ echo "Manual directory $mandir" · 59 unmodified lines
334	echo "Info directory $infodir"	330	echo "Info directory $infodir"
335	echo "Doc directory $docdir"	331	echo "Doc directory $docdir"
336	echo "Target root prefix $sysroot"	332	echo "Target root prefix $sysroot"
337	echo "Multiarch triplet $multiarch_triplet"	333	echo "Source path $source_path"
338	echo "Source path $source_path"	334	echo "C compiler $cc"
339	echo "C compiler $cc"	335	echo "CPU $cpu"
340	echo "CPU $cpu"	336	echo "Big Endian $bigendian"
341	echo "Big Endian $bigendian"	337	echo "gprof enabled $gprof"
342	echo "gprof enabled $gprof"	338	echo "cross compilers $build_cross"
343	echo "cross compilers $build_cross"	339	echo "use libgcc $use_libgcc"
344	echo "use libgcc $use_libgcc"
345		340
346	echo "Creating config.mak and config.h"	341	echo "Creating config.mak and config.h"
347		342
@@ -361,93 +356,9 @@ echo "docdir=\$(DESTDIR)$docdir" >> config.mak · 13 unmodified lines
361	echo "#ifndef CONFIG_SYSROOT" >> $TMPH	356	echo "#ifndef CONFIG_SYSROOT" >> $TMPH
362	echo "#define CONFIG_SYSROOT \"$sysroot\"" >> $TMPH	357	echo "#define CONFIG_SYSROOT \"$sysroot\"" >> $TMPH
363	echo "#endif" >> $TMPH	358	echo "#endif" >> $TMPH
364	echo "" >> $TMPH
365
366	# Set default include and library paths
367	win_incpaths="\\\b/include;\\\b/include/winapi"
368	unix_incpaths="/usr/local/include:/usr/include:\\\b/include"
369	win_libpaths="\\\b/lib"
370	unix_libpaths="CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX"
371	unix_libpaths="$unix_libpaths\":\"CONFIG_SYSROOT CONFIG_TCC_LDDIR"
372	unix_libpaths="$unix_libpaths\":\"CONFIG_SYSROOT \"/usr/local\" CONFIG_TCC_LDDIR"
373
374	# sep: path separator in paths
375	# tmp: paths multiarchified (one path per line)
376	# q: quote (if sep contains ")
377	# r: carriage return pattern (if sep contains ")
378	# s: space (if sep contains ")
379	multiarchify()
380	{
381	local sep tmp
382
383	paths="$1"
384	sep="$2"
385	tmp=""
386	q=""
387	r=""
388	s=""
389	if [ -z "${sep%%\"*}" ] ; then
390	q="\""
391	r=" \\\\\n "
392	s=" "
393	fi
394	paths="$paths$sep"
395	while test -n "$paths" ; do
396	tmp="$tmp${tmp:+$r$sep$s}${paths%%$sep*}$s$q/$multiarch_triplet$q"
397	tmp="$tmp$r$sep$s${paths%%$sep*}"
398	paths="${paths#*$sep}"
399	done
400	paths="$tmp"
401	}
402
403	if test -n "$multiarch_triplet" ; then
404	multiarchify "$win_incpaths" ";"
405	win_incpaths="\"$paths\""
406	multiarchify "$unix_incpaths" ":"
407	unix_incpaths="\"$paths\""
408	multiarchify "$win_libpaths" ";"
409	win_libpaths="\"$paths\""
410	multiarchify "$unix_libpaths" "\":\""
411	unix_libpaths="$paths"
412	echo "#define CONFIG_TCC_MULTIARCH_TRIPLET \"$multiarch_triplet\"" >> $TMPH
413	fi
414
415	echo "#ifndef CONFIG_TCC_LDDIR" >> $TMPH
416	echo " #if defined(TCC_TARGET_X86_64_CENTOS)" >> $TMPH
417	echo " #define CONFIG_TCC_LDDIR \"/lib64\"" >> $TMPH
418	echo " #else" >> $TMPH
419	echo " #define CONFIG_TCC_LDDIR \"/lib\"" >> $TMPH
420	echo " #endif" >> $TMPH
421	echo "#endif" >> $TMPH
422	echo "" >> $TMPH
423
424	echo "/* path to find crt1.o, crti.o and crtn.o */" >> $TMPH
425	echo "#ifndef CONFIG_TCC_CRT_PREFIX" >> $TMPH
426	echo "# define CONFIG_TCC_CRT_PREFIX \"/usr\" CONFIG_TCC_LDDIR" >> $TMPH
427	echo "#endif" >> $TMPH
428	echo "" >> $TMPH
429
430	echo "#ifndef CONFIG_TCC_SYSINCLUDE_PATHS" >> $TMPH
431	echo "# ifdef TCC_TARGET_PE" >> $TMPH
432	echo "# define CONFIG_TCC_SYSINCLUDE_PATHS $win_incpaths" >> $TMPH
433	echo "# else" >> $TMPH
434	echo "# define CONFIG_TCC_SYSINCLUDE_PATHS $unix_incpaths" >> $TMPH
435	echo "# endif" >> $TMPH
436	echo "#endif" >> $TMPH
437	echo "" >> $TMPH
438	echo "#ifndef CONFIG_TCC_LIBPATH" >> $TMPH
439	echo "# ifdef TCC_TARGET_PE" >> $TMPH
440	echo "# define CONFIG_TCC_LIBPATH $win_libpaths" >> $TMPH
441	echo "# else" >> $TMPH
442	echo "# define CONFIG_TCC_LIBPATH $unix_libpaths" >> $TMPH
443	echo "# endif" >> $TMPH
444	echo "#endif" >> $TMPH
445	echo "" >> $TMPH
446
447	echo "#ifndef CONFIG_TCCDIR" >> $TMPH	359	echo "#ifndef CONFIG_TCCDIR" >> $TMPH
448	echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH	360	echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH
449	echo "#endif" >> $TMPH	361	echo "#endif" >> $TMPH
450	echo "" >> $TMPH
451	echo "CC=$cc" >> config.mak	362	echo "CC=$cc" >> config.mak
452	echo "GCC_MAJOR=$gcc_major" >> config.mak	363	echo "GCC_MAJOR=$gcc_major" >> config.mak
453	echo "#define GCC_MAJOR $gcc_major" >> $TMPH	364	echo "#define GCC_MAJOR $gcc_major" >> $TMPH

libtcc.c+6−18

     return ret;
 }
-static int tcc_add_file_noerror(TCCState *s, const char *filename, int extra_flags)
+LIBTCCAPI int tcc_add_file(TCCState *s, const char *filename)
 {
     dynarray_add((void ***)&s->input_files, &s->nb_input_files, tcc_strdup(filename));
     if (s->output_type == TCC_OUTPUT_PREPROCESS)
-        return tcc_add_file_internal(s, filename, extra_flags | AFF_PREPROCESS);
+        return tcc_add_file_internal(s, filename, AFF_PRINT_ERROR | AFF_PREPROCESS);
     else
-        return tcc_add_file_internal(s, filename, extra_flags);
+        return tcc_add_file_internal(s, filename, AFF_PRINT_ERROR);
-}
-LIBTCCAPI int tcc_add_file(TCCState *s, const char *filename)
-{
-    return tcc_add_file_noerror(s, filename, AFF_PRINT_ERROR);
 }
 LIBTCCAPI int tcc_add_library_path(TCCState *s, const char *pathname)
 #else
     if ((output_type == TCC_OUTPUT_EXE || output_type == TCC_OUTPUT_DLL) &&
         !s->nostdlib) {
-        if (output_type != TCC_OUTPUT_DLL) {
+        if (output_type != TCC_OUTPUT_DLL)
-#ifdef CONFIG_TCC_MULTIARCH_TRIPLET
+            tcc_add_file(s, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crt1.o");
-            if (tcc_add_file_noerror(s, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/" CONFIG_TCC_MULTIARCH_TRIPLET "/crt1.o", 0))
+        tcc_add_file(s, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crti.o");
-#endif
-                tcc_add_file(s, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crt1.o");
-        }
-#ifdef CONFIG_TCC_MULTIARCH_TRIPLET
-        if (tcc_add_file_noerror(s, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/" CONFIG_TCC_MULTIARCH_TRIPLET "/crti.o", 0))
-#endif
-            tcc_add_file(s, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crti.o");
     }
 #endif
     return 0;

tcc.h+31−3

@@ -139,9 +139,37 @@ · 138 unmodified lines
139	#define true 1	139	#define true 1
140	typedef int BOOL;	140	typedef int BOOL;
141		141
142	/* See definition of default values of CONFIG_TCC_LDDIR, CONFIG_TCC_CRT_PREFIX,	142	#ifndef CONFIG_TCC_LDDIR
143	CONFIG_TCC_SYSINCLUDE_PATHS and CONFIG_TCC_LIBPATH in config.h or configure	143	#if defined(TCC_TARGET_X86_64_CENTOS)
144	*/	144	#define CONFIG_TCC_LDDIR "/lib64"
		145	#else
		146	#define CONFIG_TCC_LDDIR "/lib"
		147	#endif
		148	#endif
		149
		150	/* path to find crt1.o, crti.o and crtn.o */
		151	#ifndef CONFIG_TCC_CRT_PREFIX
		152	# define CONFIG_TCC_CRT_PREFIX "/usr" CONFIG_TCC_LDDIR
		153	#endif
		154
		155	#ifndef CONFIG_TCC_SYSINCLUDE_PATHS
		156	# ifdef TCC_TARGET_PE
		157	# define CONFIG_TCC_SYSINCLUDE_PATHS "\b/include;\b/include/winapi"
		158	# else
		159	# define CONFIG_TCC_SYSINCLUDE_PATHS "/usr/local/include:/usr/include:\b/include"
		160	# endif
		161	#endif
		162
		163	#ifndef CONFIG_TCC_LIBPATH
		164	# ifdef TCC_TARGET_PE
		165	# define CONFIG_TCC_LIBPATH "\b/lib"
		166	# else
		167	# define CONFIG_TCC_LIBPATH \
		168	CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX \
		169	":" CONFIG_SYSROOT CONFIG_TCC_LDDIR \
		170	":" CONFIG_SYSROOT "/usr/local" CONFIG_TCC_LDDIR
		171	# endif
		172	#endif
145		173
146	#define INCLUDE_STACK_SIZE 32	174	#define INCLUDE_STACK_SIZE 32
147	#define IFDEF_STACK_SIZE 64	175	#define IFDEF_STACK_SIZE 64

tccelf.c+2−8

     if (!s1->nostdlib) {
 #ifdef CONFIG_USE_LIBGCC
         tcc_add_library(s1, "c");
-#ifdef CONFIG_TCC_MULTIARCH_TRIPLET
+        tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_LDDIR"/libgcc_s.so.1");
-        if (tcc_add_file_internal(s1, CONFIG_SYSROOT CONFIG_TCC_LDDIR "/" CONFIG_TCC_MULTIARCH_TRIPLET "/libgcc_s.so.1", 0))
-#endif
-            tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_LDDIR"/libgcc_s.so.1");
 #else
         tcc_add_library(s1, "c");
 #ifndef WITHOUT_LIBTCC
     }
     /* add crt end if not memory output */
     if (s1->output_type != TCC_OUTPUT_MEMORY && !s1->nostdlib) {
-#ifdef CONFIG_TCC_MULTIARCH_TRIPLET
+        tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crtn.o");
-        if (tcc_add_file_internal(s1, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/" CONFIG_TCC_MULTIARCH_TRIPLET "/crtn.o", 0))
-#endif
-            tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crtn.o");
     }
 }

Revert "Add a --multiarch-triplet switch to configure"

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code