Added patch to detect and use the paths for 64bit libraries as used by CentOS (affects X86_64 only).

Nikos Mavrogiannopoulos committed 16 years ago

Commit 253bad71 parent 900871c4 files · +17 −2Browse files

Unified · Split

4 files

Makefile +1 −0
libtcc.c +7 −1
tcc.h +5 −1
tccelf.c +4 −0

@@ -40,6 +40,7 @@ ALLOCA_O=alloca86.o alloca86-bt.o · 39 unmodified lines
40	40	else
41	41	ifeq ($(ARCH),x86-64)
42	42	NATIVE_DEFINES=-DTCC_TARGET_X86_64
	43	+NATIVE_DEFINES+=$(if $(wildcard /lib64/ld-linux-x86-64.so.2),-DTCC_TARGET_X86_64_CENTOS)
43	44	LIBTCC1=libtcc1.a
44	45	BCHECK_O=
45	46	ALLOCA_O=alloca86_64.o

@@ -944,9 +944,15 @@ LIBTCCAPI TCCState *tcc_new(void) · 943 unmodified lines
944	944
945	945	#ifndef TCC_TARGET_PE
946	946	/* default library paths */
947		− tcc_add_library_path(s, CONFIG_SYSROOT "/usr/local/lib");
	947	+# if defined(TCC_TARGET_X86_64_CENTOS)
	948	+ tcc_add_library_path(s, CONFIG_SYSROOT "/usr/lib64");
	949	+ tcc_add_library_path(s, CONFIG_SYSROOT "/lib64");
	950	+ tcc_add_library_path(s, CONFIG_SYSROOT "/usr/local/lib64");
	951	+# else
948	952	tcc_add_library_path(s, CONFIG_SYSROOT "/usr/lib");
949	953	tcc_add_library_path(s, CONFIG_SYSROOT "/lib");
	954	+ tcc_add_library_path(s, CONFIG_SYSROOT "/usr/local/lib");
	955	+# endif
950	956	#endif
951	957
952	958	/* no section zero */

tcc.h+5−1

@@ -136,7 +136,11 @@ typedef int BOOL; · 135 unmodified lines
136	136
137	137	/* path to find crt1.o, crti.o and crtn.o. Only needed when generating
138	138	executables or dlls */
139		−#define CONFIG_TCC_CRT_PREFIX CONFIG_SYSROOT "/usr/lib"
	139	+#if defined(TCC_TARGET_X86_64_CENTOS)
	140	+# define CONFIG_TCC_CRT_PREFIX CONFIG_SYSROOT "/usr/lib64"
	141	+#else
	142	+# define CONFIG_TCC_CRT_PREFIX CONFIG_SYSROOT "/usr/lib"
	143	+#endif
140	144
141	145	#define INCLUDE_STACK_SIZE 32
142	146	#define IFDEF_STACK_SIZE 64

@@ -1307,7 +1307,11 @@ static const char elf_interp[] = "/libexec/ld-elf.so.1"; · 1306 unmodified lines
1307	1307	#elif defined TCC_ARM_EABI
1308	1308	static const char elf_interp[] = "/lib/ld-linux.so.3";
1309	1309	#elif defined(TCC_TARGET_X86_64)
	1310	+# if defined(TCC_TARGET_X86_64_CENTOS)
	1311	+static const char elf_interp[] = "/lib64/ld-linux-x86-64.so.2";
	1312	+# else
1310	1313	static const char elf_interp[] = "/lib/ld-linux-x86-64.so.2";
	1314	+# endif /* TCC_TARGET_X86_64_CENTOS */
1311	1315	#elif defined(TCC_UCLIBC)
1312	1316	static const char elf_interp[] = "/lib/ld-uClibc.so.0";
1313	1317	#else