source: patches/binutils-2.19.51-genscripts_multilib-1.patch@ 18eabd2

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 18eabd2 was e124019, checked in by Jim Gifford <clfs@…>, 15 years ago

Added Binutils 2.19.51
  • Property mode set to 100644
File size: 2.6 KB

  • ld/genscripts.sh 

    Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
Origin: Ryan Oliver
Date: 2009-02-03
Initial package version: 2.15 (problem also exists in 2.14 series)
Description:
        Rediffed for 2.19.1 by Jim Gifford
      
        Updated patch, use this for all binutils 2.15 series instead of the
        binutils-2.15.90.0.1-genscripts-multilib.patch

        If --with-libpath= was specified during configure (or LIB_PATH was
        supplied during make) we want to have these libraries added to the
        linker scripts search paths, and in the case of multi-lib have them
        processed to provide both lib and lib64 search paths.
        This patch produces this behaviour when building a cross-binutils.

        Also to fix an annoyance we remove whatever was specified (if anything)
        by --libdir= from the linker script search path. This is so when cross-
        compiling a 64bit target-native biarch toolchain we can specify the
        installation directory for binutils produced libraries to be */lib64
        without having this directory added to the 32bit emulation search path.

        By rights we should really check if ${libdir} matches a search path in
        any of the supported emulations for this target (as opposed to only the
        one genscripts.sh is currently processing) and if so ignore ${libpath}.

        This patch differs from the preceding genscripts-multilib patch as now
        USE_LIBPATH will always be set if LIB_PATH is non empty

diff -Naur binutils-2.19.1.orig/ld/genscripts.sh binutils-2.19.1/ld/genscripts.sh
    old new  
    132132esac
    133133
    134134# If the emulparams file sets NATIVE, make sure USE_LIBPATH is set also.
    135 if test "x$NATIVE" = "xyes" ; then
     135# Also set USE_LIBPATH if LIB_PATH has been set
     136if [ "x$NATIVE" = "xyes" -o "x${LIB_PATH}" != "x" ] ; then
    136137  USE_LIBPATH=yes
    137138fi
    138139
    … …  
    147148#
    148149# If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
    149150# the library path with the suffix applied.
    150 
    151 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
     151if [ "x${USE_LIBPATH}" = xyes ] ; then
    152152  LIB_PATH2=
     153  if [ "x${LIB_PATH}" = "x" ] ; then
     154    libs="${NATIVE_LIB_DIRS}"
     155  else
     156    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
     157    LIB_PATH=
     158  fi
    153159
    154   libs=${NATIVE_LIB_DIRS}
    155160  if [ "x${use_sysroot}" != "xyes" ] ; then
    156161    case " ${libs} " in
    157       *" ${libdir} "*) ;;
    158       *) libs="${libdir} ${libs}" ;;
    159     esac
    160     case " ${libs} " in
    161162      *" ${tool_lib} "*) ;;
    162163      *) libs="${tool_lib} ${libs}" ;;
    163164    esac
Note: See TracBrowser for help on using the repository browser.