CC libc/signal/sigjmp.o
  CC libc/signal/signal.o
  CC libc/signal/sigorset.o
  CC libc/signal/sigpause.o
  CC libc/signal/sigsetmask.o
  CC libc/signal/sigsetops.o
  CC libc/signal/sigwait.o
  CC libc/stdlib/malloc/malloc.o
libc/stdlib/malloc/malloc.c:49: error: conflicting types for
'__malloc_mmb_heap'
libc/stdlib/malloc/malloc.h:80: error: previous declaration of
'__malloc_mmb_heap' was here
make[2]: *** [libc/stdlib/malloc/malloc.o] Error 1
make[2]: Leaving directory `/opt/sh/2a/sh2aeb-build/src/uClibc-0.9.30-rc3'
make[1]: *** [build] Error 2
make[1]: Leaving directory `/opt/sh/2a/sh2aeb-build'

Still Doesn't clean build for SH2a. Same issue as in RC2.
Patch attached that fixes build.
Was this fix not applied because it doesn't affect anyone else, or because
there's a better way to fix it ? or because of something else?

--
Cheers
Kieran Bingham

2008/10/28 Bernhard Reutner-Fischer <[EMAIL PROTECTED]>

> Hi,
>
> uClibc-0.9.30-rc3 is out of the door. Please refer to
> $ svn log -r23683:23835 svn://uClibc.org/trunk/uClibc
> for the ChangeLog between the -rc2 and -rc3.
>
> The tarballs can be downloaded -- as usual -- from http://uClibc.org/
>
> The final release of 0.9.30 is (still) scheduled for \"end of October\"
> so please test this release candidate thoroughly, _now_.
>
> Thanks to everybody who fixed or reported bugs.
> _______________________________________________
> uClibc mailing list
> uClibc@uclibc.org
> http://busybox.net/cgi-bin/mailman/listinfo/uclibc
>
From 5661d4a9f7742a3d4e9baf71c185b213adb477e5 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <[EMAIL PROTECTED]>
Date: Wed, 15 Oct 2008 12:16:13 +0100
Subject: [PATCH] Fix __malloc_mmb_heap compile error

---
 libc/stdlib/malloc/free.c   |    2 +-
 libc/stdlib/malloc/malloc.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c
index fd29690..44b2f89 100644
--- a/libc/stdlib/malloc/free.c
+++ b/libc/stdlib/malloc/free.c
@@ -175,7 +175,7 @@ free_to_heap (void *mem, struct heap_free_area *heap, malloc_mutex_t *heap_lock)
               __pthread_mutex_unlock (heap_lock);
 
 	      /* Release the descriptor block we used.  */
-	      free_to_heap (mmb, &__malloc_mmb_heap, &__malloc_mmb_heap_lock);
+	      free_to_heap (mmb, __malloc_mmb_heap, &__malloc_mmb_heap_lock);
 
 	      /* Do the actual munmap.  */
 	      munmap ((void *)mmb_start, mmb_end - mmb_start);
diff --git a/libc/stdlib/malloc/malloc.h b/libc/stdlib/malloc/malloc.h
index f49ed34..657a67c 100644
--- a/libc/stdlib/malloc/malloc.h
+++ b/libc/stdlib/malloc/malloc.h
@@ -77,7 +77,7 @@ extern struct malloc_mmb *__malloc_mmapped_blocks;
 /* A heap used for allocating malloc_mmb structures.  We could allocate
    them from the main heap, but that tends to cause heap fragmentation in
    annoying ways.  */
-extern struct heap __malloc_mmb_heap;
+extern struct heap_free_area *__malloc_mmb_heap;
 
 /* Define MALLOC_MMB_DEBUGGING to cause malloc to emit debugging info about
    about mmap block allocation/freeing by the `uclinux broken munmap' code
-- 
1.5.4.3

_______________________________________________
uClibc mailing list
uClibc@uclibc.org
http://busybox.net/cgi-bin/mailman/listinfo/uclibc

Reply via email to