From a7c33ecabcead542e54c0c3514a92f4155add5b6 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Thu, 20 Jan 2011 09:15:21 +0100
Subject: stdio: fix diagnostic message

harmless copy'n paste error in #error

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 libc/stdio/_scanf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libc')

diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index 28cd21e30..1ad81cbe3 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -550,7 +550,7 @@ enum {
 #elif defined(LLONG_MAX) && (INTMAX_MAX == LLONG_MAX)
 #define IMS		8
 #else
-#error fix QUAL_CHARS ptrdiff_t entry 't'!
+#error fix QUAL_CHARS intmax_t entry 'j'!
 #endif
 
 #define QUAL_CHARS		{ \
-- 
cgit v1.2.3


From 094d82d3b3e8f8c8460a802b7a9548f3ae4fda46 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 29 Jan 2011 09:14:53 -0800
Subject: nptl/mips64: Fix build when using mips64 and ABIs other than o32

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 libc/sysdeps/linux/common/Makefile.in | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libc')

diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
index 8a4add813..cf4cf8708 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -44,6 +44,10 @@ ifeq ($(TARGET_ARCH),arm)
 CSRC := $(filter-out vfork.c, $(CSRC))
 else ifeq ($(TARGET_ARCH),x86_64)
 CSRC := $(filter-out vfork.c, $(CSRC))
+else ifeq ($(TARGET_ARCH),mips)
+ifeq ($(CONFIG_MIPS_O32_ABI),y)
+CSRC := $(filter-out waitpid.c, $(CSRC))
+endif
 else
 CSRC := $(filter-out waitpid.c, $(CSRC))
 endif
-- 
cgit v1.2.3


From 44b8aaf488b7356a893f5ce8f4b43b86334463d9 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 1 Feb 2011 17:38:07 +0100
Subject: nios2: Name architecture correctly in endian.h header

Nios II is not i386 :-)

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
---
 libc/sysdeps/linux/nios2/bits/endian.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libc')

diff --git a/libc/sysdeps/linux/nios2/bits/endian.h b/libc/sysdeps/linux/nios2/bits/endian.h
index 54bd9d14b..de60addbc 100644
--- a/libc/sysdeps/linux/nios2/bits/endian.h
+++ b/libc/sysdeps/linux/nios2/bits/endian.h
@@ -1,4 +1,4 @@
-/* i386 is little-endian.  */
+/* Nios II is little-endian.  */
 
 #ifndef _ENDIAN_H
 # error "Never use <bits/endian.h> directly; include <endian.h> instead."
-- 
cgit v1.2.3