Index: ld/emulparams/elf_s390.sh =================================================================== --- ld/emulparams/elf_s390.sh.orig 2013-01-10 21:08:02.000000000 +0100 +++ ld/emulparams/elf_s390.sh 2013-09-20 15:20:48.000000000 +0200 @@ -12,3 +12,18 @@ GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes IREL_IN_PLT= + +# Treat a host that matches the target with the possible exception of "x" +# in the name as if it were native. +if test `echo "$host" | sed -e s/x//` = `echo "$target" | sed -e s/x//`; then + case " $EMULATION_LIBPATH " in + *" ${EMULATION_NAME} "*) + NATIVE=yes + ;; + esac +fi + +# Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first. +case "$EMULATION_NAME" in + *64*) LIBPATH_SUFFIX=64 ;; +esac