Attachment 125569 Details for Bug 182965 – fully fleshed out patch

[patch] fully fleshed out patch

mono-1.1.13.2-work-with-selinux.patch (text/plain), 2.18 KB, created by Ray Strode [halfline] on 2006-03-02 21:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Strode [halfline]

Created: 2006-03-02 21:40:02 UTC

Size: 2.18 KB

patch

obsolete

>--- mono-1.1.13.2/mono/utils/mono-compiler.h.work-with-selinux	2006-02-27 12:38:30.000000000 -0500
>+++ mono-1.1.13.2/mono/utils/mono-compiler.h	2006-03-02 15:21:16.000000000 -0500
>@@ -9,10 +9,10 @@
> #ifdef HAVE_KW_THREAD
> #if HAVE_TLS_MODEL_ATTR
> 
>-#if defined(PIC) && defined(__x86_64__)
>-#define MONO_TLS_FAST 
>-#elif defined (__powerpc__)
>+#if defined (__powerpc__)
> #define MONO_TLS_FAST
>+#elif defined(PIC)
>+#define MONO_TLS_FAST __attribute__((tls_model("initial-exec")))
> #else
> #define MONO_TLS_FAST __attribute__((tls_model("local-exec")))
> #endif
>@@ -22,15 +22,23 @@
> #endif
> 
> #if defined(__GNUC__) && defined(__i386__)
>-#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("jmp 1f; .section writetext, \"awx\"; 1: movl $" #var "@ntpoff, %0; jmp 2f; .previous; 2:" : "=r" (offset));
>+#if defined(PIC)
>+#define MONO_THREAD_VAR_OFFSET(var,offset) do { int tmp; __asm ("call 1f; 1: popl %0; addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %0; movl " #var "@gotntpoff(%0), %1" : "=r" (tmp), "=r" (offset)); } while (0)
>+#else
>+#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("movl $" #var "@ntpoff, %0" : "=r" (offset))
>+#endif
> #elif defined(__x86_64__)
> #if defined(PIC)
>-#define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1
>+#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("movq " #var "@GOTTPOFF(%%rip), %0" : "=r" (foo)); offset = foo; } while (0)
> #else
>-#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("jmp 1f; .section writetext, \"awx\"; 1: movq $" #var "@TPOFF, %0; jmp 2f; .previous; 2:" : "=a" (foo)); offset = foo; } while (0);
>+#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("movq $" #var "@TPOFF, %0" : "=r" (foo)); offset = foo; } while (0)
> #endif
> #elif defined(__ia64__) && !defined(__INTEL_COMPILER)
>-#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset));
>+#if defined(PIC)
>+#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @ltoff(@tprel(" #var "#)), gp ;; ld8 %0 = [%0]\n" : "=r" (offset))
>+#else
>+#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset))
>+#endif
> #else
> #define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1
> #endif

Actions: View | Diff

Attachments on bug 182965: 125213 | 125396 | 125569