Several multiarch/biarch fixes

* Add multiarch directories for arm and i386
* Fix detection of biarch: /lib64/ld-linux-x86-64.so.2 is mandated by
  ABI and is thus always present, even if there is no biarch
* Define CONFIG_LDDIR directly with the right value in case of multiarch
  instead of defining it to /lib and then redifining it.
This commit is contained in:
Thomas Preud'homme
2012-05-23 00:14:15 +02:00
parent a2c71af1ea
commit b56edc7b90
2 changed files with 8 additions and 7 deletions

9
tcc.h
View File

@ -152,13 +152,12 @@
# define CONFIG_SYSROOT ""
#endif
#ifndef CONFIG_LDDIR
# define CONFIG_LDDIR "lib"
#ifdef CONFIG_MULTIARCHDIR
# define CONFIG_LDDIR "lib/" CONFIG_MULTIARCHDIR
#endif
#ifdef CONFIG_MULTIARCHDIR
# undef CONFIG_LDDIR
# define CONFIG_LDDIR "lib/" CONFIG_MULTIARCHDIR
#ifndef CONFIG_LDDIR
# define CONFIG_LDDIR "lib"
#endif
/* path to find crt1.o, crti.o and crtn.o */