On Tue, Apr 04, 2006 at 11:59:12PM -0400, D. Bahi wrote:
> i found that i had to add the attached patch - to handle errno usage in
> tls.c
> it seems that <linux/unistd.h> includes <asm/unistd.h> and if this is
> getting
> resolved to the system header area (which it seems to be) it doesn't get the
> EVALUE macros or the extern of 'errno' properly.

For this problem, you need this patch, sent to Andrew on Monday and included
in -mm1.

Two small TLS fixes -

arch/um/os-Linux/sys-i386/tls.c uses errno and -E* so it should include
    errno.h
__setup_host_supports_tls returns 1, but as an initcall, it should return 0

Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>

Index: linux-2.6.16/arch/um/os-Linux/sys-i386/tls.c
===================================================================
--- linux-2.6.16.orig/arch/um/os-Linux/sys-i386/tls.c   2006-04-03 
09:39:23.000000000 -0400
+++ linux-2.6.16/arch/um/os-Linux/sys-i386/tls.c        2006-04-03 
09:39:42.000000000 -0400
@@ -1,3 +1,4 @@
+#include <errno.h>
 #include <linux/unistd.h>
 #include "sysdep/tls.h"
 #include "user_util.h"
Index: linux-2.6.16/arch/um/sys-i386/tls.c
===================================================================
--- linux-2.6.16.orig/arch/um/sys-i386/tls.c    2006-04-03 09:39:15.000000000 
-0400
+++ linux-2.6.16/arch/um/sys-i386/tls.c 2006-04-03 09:39:43.000000000 -0400
@@ -378,7 +378,7 @@ static int __init __setup_host_supports_
        } else
                printk(KERN_ERR "  Host TLS support NOT detected! "
                                "TLS support inside UML will not work\n");
-       return 1;
+       return 0;
 }

 __initcall(__setup_host_supports_tls);
- 

> and still, i get this at link:
> 
> /usr/bin/ld: errno: TLS definition in /lib/libc.so.6 section .tbss
> mismatches non-TLS reference in arch/um/os-Linux/built-in.o
> /lib/libc.so.6: could not read symbols: Bad value
> collect2: ld returned 1 exit status
> nm: '.tmp_vmlinux1': No such file
> No valid symbol.
> make[2]: *** [.tmp_kallsyms1.S] Error 1
> make[1]: *** [build] Error 2

This one I have no idea about.

                                Jeff


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
User-mode-linux-user mailing list
User-mode-linux-user@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-user

Reply via email to