patches/strace/4.5.17/110-dont-use-REG_SYSCALL-for-sh.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
parent 747 d3e603e7c17c
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
(transplanted from 1ba79f2126df8bd89120899a58f2d0bcc2e9c771)
     1 Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/110-dont-use-REG_SYSCALL-for-sh.patch
     2 -= BEGIN original header =-
     3 diff -dur strace-4.5.16.orig/process.c strace-4.5.16/process.c
     4 -= END original header =-
     5 diff -durN strace-4.5.17.orig/process.c strace-4.5.17/process.c
     6 --- strace-4.5.17.orig/process.c	2008-07-18 04:16:47.000000000 +0200
     7 +++ strace-4.5.17/process.c	2008-10-24 21:30:13.000000000 +0200
     8 @@ -2726,7 +2726,6 @@
     9         { 4*REG_GBR,            "4*REG_GBR"                             },
    10         { 4*REG_MACH,           "4*REG_MACH"                            },
    11         { 4*REG_MACL,           "4*REG_MACL"                            },
    12 -       { 4*REG_SYSCALL,        "4*REG_SYSCALL"                         },
    13         { 4*REG_FPUL,           "4*REG_FPUL"                            },
    14         { 4*REG_FPREG0,         "4*REG_FPREG0"                          },
    15         { 4*(REG_FPREG0+1),     "4*REG_FPREG1"                          },