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

@@ -40,6 +40,7 @@ ALLOCA_O=alloca86.o alloca86-bt.o · 39 unmodified lines
40	else	40	else
41	ifeq ($(ARCH),x86-64)	41	ifeq ($(ARCH),x86-64)
42	NATIVE_DEFINES=-DTCC_TARGET_X86_64	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	LIBTCC1=libtcc1.a	44	LIBTCC1=libtcc1.a
44	BCHECK_O=	45	BCHECK_O=
45	ALLOCA_O=alloca86_64.o	46	ALLOCA_O=alloca86_64.o

 #ifndef TCC_TARGET_PE
     /* default library paths */
-    tcc_add_library_path(s, CONFIG_SYSROOT "/usr/local/lib");
+# if defined(TCC_TARGET_X86_64_CENTOS)
+    tcc_add_library_path(s, CONFIG_SYSROOT "/usr/lib64");
+    tcc_add_library_path(s, CONFIG_SYSROOT "/lib64");
+    tcc_add_library_path(s, CONFIG_SYSROOT "/usr/local/lib64");
+# else
     tcc_add_library_path(s, CONFIG_SYSROOT "/usr/lib");
     tcc_add_library_path(s, CONFIG_SYSROOT "/lib");
+    tcc_add_library_path(s, CONFIG_SYSROOT "/usr/local/lib");
+# endif
 #endif
     /* no section zero */

tcc.h+5−1

 /* path to find crt1.o, crti.o and crtn.o. Only needed when generating
    executables or dlls */
-#define CONFIG_TCC_CRT_PREFIX CONFIG_SYSROOT "/usr/lib"
+#if defined(TCC_TARGET_X86_64_CENTOS)
+# define CONFIG_TCC_CRT_PREFIX CONFIG_SYSROOT "/usr/lib64"
+#else
+# define CONFIG_TCC_CRT_PREFIX CONFIG_SYSROOT "/usr/lib"
+#endif
 #define INCLUDE_STACK_SIZE  32
 #define IFDEF_STACK_SIZE    64

 #elif defined TCC_ARM_EABI
 static const char elf_interp[] = "/lib/ld-linux.so.3";
 #elif defined(TCC_TARGET_X86_64)
+# if defined(TCC_TARGET_X86_64_CENTOS)
+static const char elf_interp[] = "/lib64/ld-linux-x86-64.so.2";
+# else
 static const char elf_interp[] = "/lib/ld-linux-x86-64.so.2";
+# endif /* TCC_TARGET_X86_64_CENTOS */
 #elif defined(TCC_UCLIBC)
 static const char elf_interp[] = "/lib/ld-uClibc.so.0";
 #else

Keyboard shortcuts