Attachment 849372 Details for Bug 1051830 – Patch to change "initial-exec" to "global-dynamic" under unix/xserver/

[patch] Patch to change "initial-exec" to "global-dynamic" under unix/xserver/

tigervnc11-glx-tls.patch (text/plain), 2.12 KB, created by James Pearson on 2014-01-13 13:47:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Pearson

Created: 2014-01-13 13:47:48 UTC

Size: 2.12 KB

patch

obsolete

>--- xserver/include/dix-config.h.in.glx-tls	2014-01-13 11:53:12.939620419 +0000
>+++ xserver/include/dix-config.h.in	2014-01-13 12:04:10.031598066 +0000
>@@ -426,7 +426,7 @@
> /* Define to 1 if typeof works with your compiler. */
> #undef HAVE_TYPEOF
> 
>-/* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */
>+/* The compiler supported TLS storage class, prefering global-dynamic if tls_model is supported */
> #undef TLS
> 
> /* Correctly set _XSERVER64 for OSX fat binaries */
>--- xserver/include/do-not-use-config.h.in.glx-tls	2014-01-13 11:53:12.938620457 +0000
>+++ xserver/include/do-not-use-config.h.in	2014-01-13 12:04:10.040597723 +0000
>@@ -506,7 +506,7 @@
> /* Support TCP socket connections */
> #undef TCPCONN
> 
>-/* The compiler supported TLS storage class, prefering initial-exec if
>+/* The compiler supported TLS storage class, prefering global-dynamic if
>    tls_model is supported */
> #undef TLS
> 
>--- xserver/m4/xorg-tls.m4.glx-tls	2014-01-13 11:53:12.941620342 +0000
>+++ xserver/m4/xorg-tls.m4	2014-01-13 12:04:10.044597571 +0000
>@@ -38,18 +38,18 @@ AC_DEFUN([XORG_TLS], [
>         AC_CACHE_VAL(ac_cv_tls_model, [
>             save_CFLAGS="$CFLAGS"
>             CFLAGS="$CFLAGS $STRICT_CFLAGS"
>-            AC_TRY_COMPILE([int $ac_cv_tls __attribute__((tls_model("initial-exec"))) test;], [],
>+            AC_TRY_COMPILE([int $ac_cv_tls __attribute__((tls_model("global-dynamic"))) test;], [],
>                            ac_cv_tls_model=yes, ac_cv_tls_model=no)
>             CFLAGS="$save_CFLAGS"
>         ])
>         AC_MSG_RESULT($ac_cv_tls_model)
> 
>         if test "x$ac_cv_tls_model" = "xyes" ; then
>-            xorg_tls=$ac_cv_tls' __attribute__((tls_model("initial-exec")))'
>+            xorg_tls=$ac_cv_tls' __attribute__((tls_model("global-dynamic")))'
>         else
>             xorg_tls=$ac_cv_tls
>         fi
> 
>-        AC_DEFINE_UNQUOTED([TLS], $xorg_tls, [The compiler supported TLS storage class, prefering initial-exec if tls_model is supported])
>+        AC_DEFINE_UNQUOTED([TLS], $xorg_tls, [The compiler supported TLS storage class, prefering global-dynamic if tls_model is supported])
>     fi
> ])

Actions: View | Diff

Attachments on bug 1051830: 849372 | 849421