CVS commit: pkgsrc/graphics/MesaLib

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Feb 22 09:25:22 UTC 2020

Modified Files:
        pkgsrc/graphics/MesaLib: distinfo
        pkgsrc/graphics/MesaLib/patches: patch-src_mapi_entry__x86__tls.h

Log Message:
optimize a tail-call in previous


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 pkgsrc/graphics/MesaLib/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/graphics/MesaLib/patches/patch-src_mapi_entry__x86__tls.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/distinfo
diff -u pkgsrc/graphics/MesaLib/distinfo:1.150 pkgsrc/graphics/MesaLib/distinfo:1.151
--- pkgsrc/graphics/MesaLib/distinfo:1.150      Sat Feb 22 07:52:01 2020
+++ pkgsrc/graphics/MesaLib/distinfo    Sat Feb 22 09:25:22 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.150 2020/02/22 07:52:01 tnn Exp $
+$NetBSD: distinfo,v 1.151 2020/02/22 09:25:22 tnn Exp $
 
 SHA1 (mesa-19.2.7.tar.xz) = 9b8ebf66770353a48bd710e12e2727fb33645f44
 RMD160 (mesa-19.2.7.tar.xz) = 5323b623ac22c168b86548cf6d842ce004e346a9
@@ -31,7 +31,7 @@ SHA1 (patch-src_intel_perf_gen__perf.c) 
 SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = d8f636e3c3e76763a505a1dce23de0b198ad62fa
 SHA1 (patch-src_loader_loader.c) = 303e941f9b8afa6ee8053107af01e2c26e6ff118
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = cbbb95b96414609a9cd05af75c9544f8e6938280
-SHA1 (patch-src_mapi_entry__x86__tls.h) = c8ad1cb3854efeba8d709a66bdddb818854820ea
+SHA1 (patch-src_mapi_entry__x86__tls.h) = e5229912def548856662b0d764b0f2fc07457a57
 SHA1 (patch-src_mapi_u__current.c) = 4e3ec6e253af3737f77ecd43e56044ba2b81e699
 SHA1 (patch-src_mapi_u__current.h) = 9f4744681381a0959fda2926a436f296c89577f3
 SHA1 (patch-src_mesa_main_extensions.c) = 2f48bdb1176c2878bb33bcfab7556172b50a987e

Index: pkgsrc/graphics/MesaLib/patches/patch-src_mapi_entry__x86__tls.h
diff -u pkgsrc/graphics/MesaLib/patches/patch-src_mapi_entry__x86__tls.h:1.4 pkgsrc/graphics/MesaLib/patches/patch-src_mapi_entry__x86__tls.h:1.5
--- pkgsrc/graphics/MesaLib/patches/patch-src_mapi_entry__x86__tls.h:1.4        Sat Feb 22 07:52:01 2020
+++ pkgsrc/graphics/MesaLib/patches/patch-src_mapi_entry__x86__tls.h    Sat Feb 22 09:25:22 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_mapi_entry__x86__tls.h,v 1.4 2020/02/22 07:52:01 tnn Exp $
+$NetBSD: patch-src_mapi_entry__x86__tls.h,v 1.5 2020/02/22 09:25:22 tnn Exp $
 
 NetBSD only supports zero-initialized initial-exec tls variables in conjuction
 with dlopen(3) at the moment.
 
 --- src/mapi/entry_x86_tls.h.orig      2019-12-04 22:10:14.000000000 +0000
 +++ src/mapi/entry_x86_tls.h
-@@ -43,6 +43,21 @@ __asm__("x86_current_tls:\n\t"
+@@ -43,6 +43,20 @@ __asm__("x86_current_tls:\n\t"
        "movl " ENTRY_CURRENT_TABLE "@GOTNTPOFF(%eax), %eax\n\t"
        "ret");
  
@@ -20,14 +20,13 @@ with dlopen(3) at the moment.
 +      "2:\n\t"                      \
 +      "popl %eax\n\t"               \
 +      "addl $_GLOBAL_OFFSET_TABLE_+[.-2b], %eax\n\t" \
-+      "call *" ENTRY_CURRENT_TABLE_GET "@GOT(%eax)\n\t" \
-+      "ret");
++      "jmp *" ENTRY_CURRENT_TABLE_GET "@GOT(%eax)");
 +#endif
 +
  #ifndef GLX_X86_READONLY_TEXT
  __asm__(".section wtext, \"awx\", @progbits");
  #endif /* GLX_X86_READONLY_TEXT */
-@@ -56,10 +71,17 @@ __asm__(".balign 16\n"
+@@ -56,10 +70,17 @@ __asm__(".balign 16\n"
     ".balign 16\n"                \
     func ":"