From 449168b8d097a69b02a81a35e4d088675f23b592 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 30 Dec 2003 11:25:21 +0000
Subject: Update for the latest uClibc

---
 sources/ltp-testsuite.patch | 25 ++++++++++++++-----------
 sources/uClibc.config       |  3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'sources')

diff --git a/sources/ltp-testsuite.patch b/sources/ltp-testsuite.patch
index 71eee0d1f..63ed7e600 100644
--- a/sources/ltp-testsuite.patch
+++ b/sources/ltp-testsuite.patch
@@ -9,17 +9,20 @@
  
  all: $(TARGETS)
  
---- ltp-full-20031002/testcases/kernel/syscalls/mallopt/Makefile.orig	2003-10-02 19:20:52.000000000 -0600
-+++ ltp-full-20031002/testcases/kernel/syscalls/mallopt/Makefile	2003-10-02 19:21:07.000000000 -0600
-@@ -23,7 +23,7 @@
- LOADLIBES+=	-L../../../../lib -lltp 
- 
- SRCS=$(wildcard *.c)
--TARGETS=$(patsubst %.c,%,$(SRCS))
-+TARGETS=#$(patsubst %.c,%,$(SRCS))
- 
- all: $(TARGETS)
- 
+--- ltp-full-20031204/testcases/kernel/syscalls/mallopt/mallopt01.orig.c
++++ ltp-full-20031204/testcases/kernel/syscalls/mallopt/mallopt01.c
+@@ -85,11 +85,6 @@
+ 		flag = 1;
+ 		local_flag = FAILED;
+ 	};
+-	if (info.usmblks != 0) {
+-		fprintf(temp, "mallinfo failed: usmblks != 0\n");
+-		flag = 1;
+-		local_flag = FAILED;
+-	}
+ 	if (info.smblks != 0) {
+ 		fprintf(temp, "mallinfo failed: smblks != 0\n");
+ 		flag = 1;
 --- ltp-full-20031002/testcases/kernel/syscalls/profil/Makefile.orig	2003-10-02 19:27:53.000000000 -0600
 +++ ltp-full-20031002/testcases/kernel/syscalls/profil/Makefile	2003-10-02 19:28:02.000000000 -0600
 @@ -23,7 +23,7 @@
diff --git a/sources/uClibc.config b/sources/uClibc.config
index 33a346f66..ac47a7381 100644
--- a/sources/uClibc.config
+++ b/sources/uClibc.config
@@ -45,7 +45,8 @@ UCLIBC_HAS_THREADS=y
 PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
-MALLOC_930716=y
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
 HAS_SHADOW=y
-- 
cgit v1.2.3