From owner-freebsd-x11@FreeBSD.ORG Sun Nov 21 13:40:11 2010 Return-Path: Delivered-To: freebsd-x11@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 088D31065670 for ; Sun, 21 Nov 2010 13:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EB5D18FC14 for ; Sun, 21 Nov 2010 13:40:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oALDeA7i044704 for ; Sun, 21 Nov 2010 13:40:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oALDeAli044702; Sun, 21 Nov 2010 13:40:10 GMT (envelope-from gnats) Date: Sun, 21 Nov 2010 13:40:10 GMT Message-Id: <201011211340.oALDeAli044702@freefall.freebsd.org> To: freebsd-x11@FreeBSD.org From: Koop Mast Cc: Subject: Re: ports/147646: [PATCH] graphics/libGL: fix linking with newer gcc and binutils X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Koop Mast List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Nov 2010 13:40:11 -0000 The following reply was made to PR ports/147646; it has been noted by GNATS. From: Koop Mast To: bug-followup@FreeBSD.org, avg@icyb.net.ua Cc: Subject: Re: ports/147646: [PATCH] graphics/libGL: fix linking with newer gcc and binutils Date: Sun, 21 Nov 2010 14:12:54 +0100 --MP_/izcuzakYpiBpRHer2bssqdG Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline What Dimitry forgot to mention that this problem showed up while working on the binutils 2.17 update. Since this will be in head at some point it makes sense to get this fixed. Anyway patch here, it fixes it for all the mesa based ports (I think I got them all). --MP_/izcuzakYpiBpRHer2bssqdG Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=libGL-binutils-2.17.diff Index: graphics/libGL/files/patch-src_mesa_x86-64_glapi-x86-64.S =================================================================== RCS file: graphics/libGL/files/patch-src_mesa_x86-64_glapi-x86-64.S diff -N graphics/libGL/files/patch-src_mesa_x86-64_glapi-x86-64.S --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/libGL/files/patch-src_mesa_x86-64_glapi-x86-64.S 19 Nov 2010 11:45:47 -0000 @@ -0,0 +1,11 @@ +--- src/mesa/x86-64/glapi_x86-64.S.orig 2010-11-19 12:21:35.000000000 +0100 ++++ src/mesa/x86-64/glapi_x86-64.S 2010-11-19 12:22:15.000000000 +0100 +@@ -73,7 +73,7 @@ _x86_64_get_dispatch: + + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rdi + jmp pthread_getspecific@PLT + + #elif defined(THREADS) Index: graphics/libGLU/files/patch-src_mesa_x86-64_glapi-x86-64.S =================================================================== RCS file: graphics/libGLU/files/patch-src_mesa_x86-64_glapi-x86-64.S diff -N graphics/libGLU/files/patch-src_mesa_x86-64_glapi-x86-64.S --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/libGLU/files/patch-src_mesa_x86-64_glapi-x86-64.S 19 Nov 2010 11:45:47 -0000 @@ -0,0 +1,11 @@ +--- src/mesa/x86-64/glapi_x86-64.S.orig 2010-11-19 12:21:35.000000000 +0100 ++++ src/mesa/x86-64/glapi_x86-64.S 2010-11-19 12:22:15.000000000 +0100 +@@ -73,7 +73,7 @@ _x86_64_get_dispatch: + + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rdi + jmp pthread_getspecific@PLT + + #elif defined(THREADS) Index: graphics/libGLw/files/patch-src_mesa_x86-64_glapi-x86-64.S =================================================================== RCS file: graphics/libGLw/files/patch-src_mesa_x86-64_glapi-x86-64.S diff -N graphics/libGLw/files/patch-src_mesa_x86-64_glapi-x86-64.S --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/libGLw/files/patch-src_mesa_x86-64_glapi-x86-64.S 19 Nov 2010 11:45:47 -0000 @@ -0,0 +1,11 @@ +--- src/mesa/x86-64/glapi_x86-64.S.orig 2010-11-19 12:21:35.000000000 +0100 ++++ src/mesa/x86-64/glapi_x86-64.S 2010-11-19 12:22:15.000000000 +0100 +@@ -73,7 +73,7 @@ _x86_64_get_dispatch: + + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rdi + jmp pthread_getspecific@PLT + + #elif defined(THREADS) Index: graphics/libglut/files/patch-src_mesa_x86-64_glapi-x86-64.S =================================================================== RCS file: graphics/libglut/files/patch-src_mesa_x86-64_glapi-x86-64.S diff -N graphics/libglut/files/patch-src_mesa_x86-64_glapi-x86-64.S --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/libglut/files/patch-src_mesa_x86-64_glapi-x86-64.S 19 Nov 2010 11:45:47 -0000 @@ -0,0 +1,11 @@ +--- src/mesa/x86-64/glapi_x86-64.S.orig 2010-11-19 12:21:35.000000000 +0100 ++++ src/mesa/x86-64/glapi_x86-64.S 2010-11-19 12:22:15.000000000 +0100 +@@ -73,7 +73,7 @@ _x86_64_get_dispatch: + + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rdi + jmp pthread_getspecific@PLT + + #elif defined(THREADS) Index: graphics/mesa-demos/files/patch-src_mesa_x86-64_glapi-x86-64.S =================================================================== RCS file: graphics/mesa-demos/files/patch-src_mesa_x86-64_glapi-x86-64.S diff -N graphics/mesa-demos/files/patch-src_mesa_x86-64_glapi-x86-64.S --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/mesa-demos/files/patch-src_mesa_x86-64_glapi-x86-64.S 19 Nov 2010 11:45:47 -0000 @@ -0,0 +1,11 @@ +--- src/mesa/x86-64/glapi_x86-64.S.orig 2010-11-19 12:21:35.000000000 +0100 ++++ src/mesa/x86-64/glapi_x86-64.S 2010-11-19 12:22:15.000000000 +0100 +@@ -73,7 +73,7 @@ _x86_64_get_dispatch: + + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rdi + jmp pthread_getspecific@PLT + + #elif defined(THREADS) --MP_/izcuzakYpiBpRHer2bssqdG--