bug-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

The Hurd and gcc 3.4.x part #3


From: Alfred M. Szmidt
Subject: The Hurd and gcc 3.4.x part #3
Date: Fri, 03 Sep 2004 16:48:29 +0200

Fix for the following: 

/usr/local/lib/gcc/i386-unknown-gnu0.3/3.4.0/../../../../i386-unknown-gnu0.3/lib/libcrt.a(malloc.o)(.text+0x10d8):
 In function `__libc_free':
/export/ams/libc/malloc/malloc.c:3355: multiple definition of `free'
kalloc.o(.text+0x334):../../hurd/mach-defpager/../serverboot/kalloc.c:259: 
first defined here
/usr/local/lib/gcc/i386-unknown-gnu0.3/3.4.0/../../../../i386-unknown-gnu0.3/bin/ld:
 Warning: size of symbol `free' changed from 5 in kalloc.o to 124 in 
/usr/local/lib/g\
cc/i386-unknown-gnu0.3/3.4.0/../../../../i386-unknown-gnu0.3/lib/libcrt.a(malloc.o)
/usr/local/lib/gcc/i386-unknown-gnu0.3/3.4.0/../../../../i386-unknown-gnu0.3/lib/libcrt.a(malloc.o)(.text+0x2740):
 In function `__libc_malloc':
/export/ams/libc/malloc/malloc.c:3312: multiple definition of `malloc'
kalloc.o(.text+0x328):../../hurd/mach-defpager/../serverboot/kalloc.c:254: 
first defined here
/usr/local/lib/gcc/i386-unknown-gnu0.3/3.4.0/../../../../i386-unknown-gnu0.3/bin/ld:
 Warning: size of symbol `malloc' changed from 9 in kalloc.o to 301 in 
/usr/local/lib\
/gcc/i386-unknown-gnu0.3/3.4.0/../../../../i386-unknown-gnu0.3/lib/libcrt.a(malloc.o)

Index: serverboot/ChangeLog
2004-09-03  Alfred M. Szmidt  <ams@kemisten.nu>

        * kalloc.c (malloc, free): Functions removed.

Index: serverboot/kalloc.c
===================================================================
RCS file: /cvsroot/hurd/hurd/serverboot/kalloc.c,v
retrieving revision 1.1
diff -u -r1.1 kalloc.c
--- serverboot/kalloc.c 3 Apr 1997 23:27:41 -0000       1.1
+++ serverboot/kalloc.c 3 Sep 2004 14:46:04 -0000
@@ -250,17 +250,6 @@
        }
 }
 
-void *malloc(vm_size_t size)
-{
-       return (void *)kalloc(size);
-}
-
-void free(void *addr)
-{
-  /* Just ignore harmless attempts at cleanliness.  */
-  /*   panic("free not implemented"); */
-}
-
 void malloc_fork_prepare()
 {
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]