Changeset 4d4988e in mainline

Timestamp:

2011-06-24T02:15: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:

021c508

Parents:

3e22494f

Message:

Added intrusive patch for libiberty code.

File:

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

uspace/app/binutils/intrusive.sh

@@ -66 +66 @@
 # became mandatory (although not really needed).
 #
+# Patch 4
+# Whereas most systems maps pid_t to signed type, HelenOS maps it
+# to unsigned type. This causes some type incompatibility in libiberty
+# files related to executing a subprocess. Since both as and ld are
+# not runtime dependent on this functionality, the simplest solution is
+# to patch libiberty to avoid compiler warnings.
+#
 
 case "$1" in
@@ -76 +83 @@
                 cp -f "$2/ld/configure" "$2/ld/configure.backup"
                 cp -f "$2/libiberty/configure" "$2/libiberty/configure.backup"
+                cp -f "$2/libiberty/pex-common.h" "$2/libiberty/pex-common.h.backup"
                 cp -f "$2/opcodes/configure" "$2/opcodes/configure.backup"
 
@@ -116 +124 @@
                 > "$2/libiberty/configure"
 
+                # Patch libiberty pex-common.h.
+                cat "$2/libiberty/pex-common.h.backup" | \
+                # See Patch 4.
+                sed 's/pid_t (\*wait)/int (*wait)/g' \
+                > "$2/libiberty/pex-common.h"
+
                 # Patch opcodes configure script.
                 cat "$2/opcodes/configure.backup" | \
@@ -133 +147 @@
                 mv -f "$2/ld/configure.backup" "$2/ld/configure"
                 mv -f "$2/libiberty/configure.backup" "$2/libiberty/configure"
+                mv -f "$2/libiberty/pex-common.h.backup" "$2/libiberty/pex-common.h"
                 mv -f "$2/opcodes/configure.backup" "$2/opcodes/configure"
                 ;;