mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-20 05:17:54 +00:00
1906cf93f8
You might just say: 'Yeah! crosstool-NG's got its own repo!". Unfortunately, that's because the previous repo got damaged beyond repair and I had no backup. That means I'm putting backups in place in the afternoon. That also means we've lost history... :-(
86 lines
3.5 KiB
Diff
86 lines
3.5 KiB
Diff
See http://gcc.gnu.org/PR12009
|
|
|
|
Fixes the following problems when testing a cross-compiler:
|
|
|
|
============================================
|
|
Testing g++.dg/compat/abi/bitfield1,
|
|
...
|
|
Invoking the compiler as /crosstool-0.12/build/powerpc-750-linux-gnu/gcc-3.3-gli
|
|
bc-2.2.5/build-gcc/gcc/testsuite/../g++ ...
|
|
/crosstool-0.12/build/powerpc-750-linux-gnu/gcc-3.3-glibc-2.2.5/gcc-3.3/gcc/test
|
|
suite/g++.dg/compat/abi/bitfield1_main.C
|
|
pid is 16028 -16028
|
|
compiler exited with status 1
|
|
output is:
|
|
sh: error while loading shared libraries: /opt/cegl-2.0/powerpc-750-linux-gnu/gc
|
|
c-3.3-glibc-2.2.5/powerpc-750-linux-gnu/./lib/libdl.so.2: ELF file data encoding
|
|
not little-endian
|
|
/crosstool-0.12/build/powerpc-750-linux-gnu/gcc-3.3-glibc-2.2.5/build-gcc/gcc/te
|
|
stsuite/../g++: error while loading shared libraries: /opt/cegl-2.0/powerpc-750-
|
|
linux-gnu/gcc-3.3-glibc-2.2.5/powerpc-750-linux-gnu/./lib/libc.so.6: ELF file da
|
|
ta encoding not little-endian
|
|
|
|
FAIL: g++.dg/compat/abi/bitfield1 main_tst.o compile
|
|
============================================
|
|
|
|
and
|
|
|
|
sh: error while loading shared libraries: /opt/cegl-2.0/powerpc-405-linux-gnu/gcc-3.2.3-glibc-2.2.5/powerpc-405-linux-gnu/./lib/libdl.so.2: ELF file data encoding not little-endian
|
|
|
|
|
|
|
|
--- gcc-3.3/gcc/testsuite/g++.dg/compat/compat.exp.old Thu Oct 17 17:22:57 2002
|
|
+++ gcc-3.3/gcc/testsuite/g++.dg/compat/compat.exp Mon Jul 14 10:59:19 2003
|
|
@@ -42,11 +42,13 @@
|
|
proc compat-fix-library-path { } {
|
|
global ld_library_path
|
|
|
|
- # See comments in lib/g++.exp for why this is needed.
|
|
- setenv LD_LIBRARY_PATH $ld_library_path
|
|
- setenv SHLIB_PATH $ld_library_path
|
|
- setenv LD_LIBRARYN32_PATH $ld_library_path
|
|
- setenv LD_LIBRARY64_PATH $ld_library_path
|
|
+ if {![is_remote target]} {
|
|
+ # See comments in lib/g++.exp for why this is needed.
|
|
+ setenv LD_LIBRARY_PATH $ld_library_path
|
|
+ setenv SHLIB_PATH $ld_library_path
|
|
+ setenv LD_LIBRARYN32_PATH $ld_library_path
|
|
+ setenv LD_LIBRARY64_PATH $ld_library_path
|
|
+ }
|
|
}
|
|
|
|
#
|
|
--- gcc-3.4-20030813/gcc/testsuite/lib/g++.exp.orig Tue Jun 17 18:56:45 2003
|
|
+++ gcc-3.4-20030813/gcc/testsuite/lib/g++.exp Sun Aug 17 18:35:38 2003
|
|
@@ -166,16 +182,20 @@
|
|
}
|
|
}
|
|
|
|
- # On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
|
|
- # called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
|
|
- # (for the 64-bit ABI). The right way to do this would be to modify
|
|
- # unix.exp -- but that's not an option since it's part of DejaGNU
|
|
- # proper, so we do it here. We really only need to do
|
|
- # this on IRIX, but it shouldn't hurt to do it anywhere else.
|
|
- setenv LD_LIBRARY_PATH $ld_library_path
|
|
- setenv SHLIB_PATH $ld_library_path
|
|
- setenv LD_LIBRARYN32_PATH $ld_library_path
|
|
- setenv LD_LIBRARY64_PATH $ld_library_path
|
|
+ if {![is_remote target]} {
|
|
+ # On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
|
|
+ # called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
|
|
+ # (for the 64-bit ABI). The right way to do this would be to modify
|
|
+ # unix.exp -- but that's not an option since it's part of DejaGNU
|
|
+ # proper, so we do it here. We really only need to do
|
|
+ # this on IRIX, but it shouldn't hurt to do it anywhere else.
|
|
+
|
|
+ # Doing this causes us to be unable to run cross-compilers.
|
|
+ setenv LD_LIBRARY_PATH $ld_library_path
|
|
+ setenv SHLIB_PATH $ld_library_path
|
|
+ setenv LD_LIBRARYN32_PATH $ld_library_path
|
|
+ setenv LD_LIBRARY64_PATH $ld_library_path
|
|
+ }
|
|
|
|
return "$flags"
|
|
}
|