64bithack.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233
  1. By default gcc places 64 bit libs in a lib64 directory. This makes it use
  2. "lib" instead.
  3. RP 25/7/10
  4. Index: gcc-4.5.0/gcc/config/i386/t-linux64
  5. ===================================================================
  6. --- gcc-4.5.0.orig/gcc/config/i386/t-linux64 2009-04-21 20:03:23.000000000 +0100
  7. +++ gcc-4.5.0/gcc/config/i386/t-linux64 2010-08-03 14:53:26.471180113 +0100
  8. @@ -24,8 +24,8 @@
  9. # MULTILIB_OSDIRNAMES according to what is found on the target.
  10. MULTILIB_OPTIONS = m64/m32
  11. -MULTILIB_DIRNAMES = 64 32
  12. -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
  13. +MULTILIB_DIRNAMES = . 32
  14. +MULTILIB_OSDIRNAMES = . $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
  15. LIBGCC = stmp-multilib
  16. INSTALL_LIBGCC = install-multilib
  17. Index: gcc-4.5.0/gcc/config/i386/linux64.h
  18. ===================================================================
  19. --- gcc-4.5.0.orig/gcc/config/i386/linux64.h 2010-03-24 20:44:48.000000000 +0000
  20. +++ gcc-4.5.0/gcc/config/i386/linux64.h 2010-08-03 14:54:24.737056070 +0100
  21. @@ -59,1 +59,1 @@
  22. done. */
  23. #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  24. -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
  25. +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
  26. #if TARGET_64BIT_DEFAULT
  27. #define SPEC_32 "m32"