Changeset 051e6ac in mainline for uspace/app/binutils/intrusive.sh

Timestamp:

2011-07-30T13:45:39Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b7ee0369

Parents:

056d6821

Message:

Added arm32-specific intrusive patch.

File:

• uspace/app/binutils/intrusive.sh (modified) (4 diffs)

uspace/app/binutils/intrusive.sh

@@ -92 +92 @@
 # incompatibility, libiberty fnmatch has to be manually hidden.
 #
+# Patch 8
+# When building binutils for arm32 target, there is a conflict with
+# libposix function name redefinitons in one of the arm-specific files.
+#
 
 case "$1" in
@@ -99 +103 @@
                 cp -f "$2/bfd/configure" "$2/bfd/configure.backup"
                 cp -f "$2/gas/configure" "$2/gas/configure.backup"
+                cp -f "$2/gas/config/tc-arm.c" "$2/gas/config/tc-arm.c.backup"
                 cp -f "$2/intl/configure" "$2/intl/configure.backup"
                 cp -f "$2/ld/configure" "$2/ld/configure.backup"
@@ -129 +134 @@
                 sed 's/^cross_compiling=no/cross_compiling=yes/g' \
                 > "$2/gas/configure"
+
+                # Patch gas tc-arm.c.
+                cat "$2/gas/config/tc-arm.c.backup" | \
+                # See Patch 8.
+                sed 's/\(#include "dwarf2dbg.h"\)/\1\n#undef div/g' \
+                > "$2/gas/config/tc-arm.c"
 
                 # Patch intl configure script.
@@ -193 +204 @@
                 mv -f "$2/bfd/configure.backup" "$2/bfd/configure"
                 mv -f "$2/gas/configure.backup" "$2/gas/configure"
+                mv -f "$2/gas/config/tc-arm.c.backup" "$2/gas/config/tc-arm.c"
                 mv -f "$2/intl/configure.backup" "$2/intl/configure"
                 mv -f "$2/ld/configure.backup" "$2/ld/configure"