summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2011-02-03 11:14:03 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2011-02-03 11:16:42 +0100
commitac5e9d08f4f7aa004e48b9484c3005f0ecc0a105 (patch)
tree32d30bd157f862792fdc4193eb2372e4d8cd0df4 /libc
parentfd3120fb9ec9fe01d458962dca510eb81d06fcc8 (diff)
parent269f901e62106e2d36acf4c2b79a9a5ec6d684ff (diff)
Merge remote branch 'origin/master' into prelink
* origin/master: arm: fix the static link problem for ARM due to undefined __tls_get_addr nios2: Name architecture correctly in endian.h header nptl/mips64: Fix build when using mips64 and ABIs other than o32 mips: avoid segmentation fault when RLD_MAP is 0 libc: fix linker script generation for libubacktrace.so stdio: fix diagnostic message Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc')
-rw-r--r--libc/stdio/_scanf.c2
-rw-r--r--libc/sysdeps/linux/common/Makefile.in4
-rw-r--r--libc/sysdeps/linux/nios2/bits/endian.h2
3 files changed, 6 insertions, 2 deletions
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 { \
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
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."