patches/uClibc/0.9.29/160-custom-ISA.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
parent 118 264aa721d2a4
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.
     1 diff -dur uClibc-0.9.29.orig/extra/Configs/Config.mips uClibc-0.9.29/extra/Configs/Config.mips
     2 --- uClibc-0.9.29.orig/extra/Configs/Config.mips	2007-03-16 20:38:14.000000000 +0100
     3 +++ uClibc-0.9.29/extra/Configs/Config.mips	2007-05-22 19:30:43.000000000 +0200
     4 @@ -71,4 +71,16 @@
     5  config CONFIG_MIPS_ISA_MIPS64
     6  	bool "MIPS64"
     7  
     8 +config CONFIG_MIPS_ISA_CUSTOM
     9 +	bool "Custom"
    10 +
    11  endchoice
    12 +
    13 +config CONFIG_MIPS_CPU_CFLAGS_CUSTOM
    14 +	string
    15 +	prompt "Custon ISA"
    16 +	depends on CONFIG_MIPS_ISA_CUSTOM
    17 +	default ""
    18 +	help
    19 +	  Enter your custom ISA here (eg: lx4189!).
    20 +
    21 diff -dur uClibc-0.9.29.orig/Rules.mak uClibc-0.9.29/Rules.mak
    22 --- uClibc-0.9.29.orig/Rules.mak	2007-04-17 15:34:11.000000000 +0200
    23 +++ uClibc-0.9.29/Rules.mak	2007-05-22 19:31:48.000000000 +0200
    24 @@ -234,6 +234,7 @@
    25  	CPU_CFLAGS-$(CONFIG_MIPS_N64_ABI)+=-mabi=64
    26  	CPU_CFLAGS-$(CONFIG_MIPS_O32_ABI)+=-mabi=32
    27  	CPU_CFLAGS-$(CONFIG_MIPS_N32_ABI)+=-mabi=n32
    28 +	CPU_CFLAGS-$(CONFIG_MIPS_ISA_CUSTOM)+=-march=$(CONFIG_MIPS_CPU_CFLAGS_CUSTOM)
    29  endif
    30  
    31  ifeq ($(TARGET_ARCH),nios)