Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset b705ecc in mainline


Ignore:
Timestamp:
2011-08-14T00:20:41Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
0f963cb
Parents:
1cc4a09 (diff), d3e241a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge binutils changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/binutils/intrusive.sh

    r1cc4a09 rb705ecc  
    9292# incompatibility, libiberty fnmatch has to be manually hidden.
    9393#
     94# Patch 8
     95# When building binutils for arm32 target, there is a conflict with
     96# libposix function name redefinitons in one of the arm-specific files.
     97#
    9498
    9599case "$1" in
     
    99103                cp -f "$2/bfd/configure" "$2/bfd/configure.backup"
    100104                cp -f "$2/gas/configure" "$2/gas/configure.backup"
     105                cp -f "$2/gas/config/tc-arm.c" "$2/gas/config/tc-arm.c.backup"
    101106                cp -f "$2/intl/configure" "$2/intl/configure.backup"
    102107                cp -f "$2/ld/configure" "$2/ld/configure.backup"
     
    129134                sed 's/^cross_compiling=no/cross_compiling=yes/g' \
    130135                > "$2/gas/configure"
     136
     137                # Patch gas tc-arm.c.
     138                cat "$2/gas/config/tc-arm.c.backup" | \
     139                # See Patch 8.
     140                sed 's/\(#include "dwarf2dbg.h"\)/\1\n#undef div/g' \
     141                > "$2/gas/config/tc-arm.c"
    131142
    132143                # Patch intl configure script.
     
    193204                mv -f "$2/bfd/configure.backup" "$2/bfd/configure"
    194205                mv -f "$2/gas/configure.backup" "$2/gas/configure"
     206                mv -f "$2/gas/config/tc-arm.c.backup" "$2/gas/config/tc-arm.c"
    195207                mv -f "$2/intl/configure.backup" "$2/intl/configure"
    196208                mv -f "$2/ld/configure.backup" "$2/ld/configure"
Note: See TracChangeset for help on using the changeset viewer.