summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-06-19 07:37:01 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-06-19 07:37:01 +0000
commitf56a5ba995ce1e5114046d6048d75c1dcd27cf18 (patch)
tree73ca5dca90493fbc7e60c615aa41277d870f2584
parent588375e0eccfb3411b2416922f8f12e693cec00e (diff)
downloadOSELAS.Toolchain-f56a5ba995ce1e5114046d6048d75c1dcd27cf18.tar.gz
* patches/linux-2.6.27, ChangeLog:
fixed getline problem git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/branches/OSELAS.Toolchain-1.99.3-branch@11487 f8d472c7-5700-0410-ac5a-87979cec3adf
-rw-r--r--ChangeLog4
-rw-r--r--patches/linux-2.6.27/generic/0001-kbuild-fix-C-libary-confusion-in-unifdef.c-due-to-ge.patch56
-rw-r--r--patches/linux-2.6.27/generic/series1
3 files changed, 61 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d21ff09..bcfd1b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-19 Marc Kleine-Budde <mkl@pengutronix.de>
+ * kernel: add patch that fixes getline problem with glibc > 2.10
+ (backport from current mainline kernel)
+
2009-05-08 Marc Kleine-Budde <mkl@pengutronix.de>
* libstdc++: install into sysroot, fixes problem with binutils > 2.19
(only arm-1136 toolchain affected)
diff --git a/patches/linux-2.6.27/generic/0001-kbuild-fix-C-libary-confusion-in-unifdef.c-due-to-ge.patch b/patches/linux-2.6.27/generic/0001-kbuild-fix-C-libary-confusion-in-unifdef.c-due-to-ge.patch
new file mode 100644
index 0000000..9155223
--- /dev/null
+++ b/patches/linux-2.6.27/generic/0001-kbuild-fix-C-libary-confusion-in-unifdef.c-due-to-ge.patch
@@ -0,0 +1,56 @@
+From d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7 Mon Sep 17 00:00:00 2001
+From: Justin P. Mattock <justinmattock@gmail.com>
+Date: Sat, 7 Mar 2009 13:31:29 +0100
+Subject: [PATCH] kbuild: fix C libary confusion in unifdef.c due to getline()
+
+This fixes an error when compiling the kernel.
+
+ CHK include/linux/version.h
+ HOSTCC scripts/unifdef
+scripts/unifdef.c:209: error: conflicting types for 'getline'
+/usr/include/stdio.h:651: note: previous declaration of 'getline' was here
+make[1]: *** [scripts/unifdef] Error 1
+make: *** [__headers] Error 2
+
+Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
+Cc: Frederic Weisbecker <fweisbec@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
+---
+ scripts/unifdef.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/unifdef.c b/scripts/unifdef.c
+index 552025e..05a31a6 100644
+--- a/scripts/unifdef.c
++++ b/scripts/unifdef.c
+@@ -206,7 +206,7 @@ static void done(void);
+ static void error(const char *);
+ static int findsym(const char *);
+ static void flushline(bool);
+-static Linetype getline(void);
++static Linetype get_line(void);
+ static Linetype ifeval(const char **);
+ static void ignoreoff(void);
+ static void ignoreon(void);
+@@ -512,7 +512,7 @@ process(void)
+
+ for (;;) {
+ linenum++;
+- lineval = getline();
++ lineval = get_line();
+ trans_table[ifstate[depth]][lineval]();
+ debug("process %s -> %s depth %d",
+ linetype_name[lineval],
+@@ -526,7 +526,7 @@ process(void)
+ * help from skipcomment().
+ */
+ static Linetype
+-getline(void)
++get_line(void)
+ {
+ const char *cp;
+ int cursym;
+--
+1.6.3.1
+
diff --git a/patches/linux-2.6.27/generic/series b/patches/linux-2.6.27/generic/series
new file mode 100644
index 0000000..0ea0480
--- /dev/null
+++ b/patches/linux-2.6.27/generic/series
@@ -0,0 +1 @@
+0001-kbuild-fix-C-libary-confusion-in-unifdef.c-due-to-ge.patch