ports/147646: [PATCH] graphics/libGL: fix linking with newer gcc and binutils

[Koop Mast]

The following reply was made to PR ports/147646; it has been noted by GNATS.

From: Koop Mast <kwm at FreeBSD.org>
To: bug-followup at FreeBSD.org, avg at 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 at GOTPCREL(%rip), %rdi
 + 	jmp	pthread_getspecific at 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 at GOTPCREL(%rip), %rdi
 + 	jmp	pthread_getspecific at 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 at GOTPCREL(%rip), %rdi
 + 	jmp	pthread_getspecific at 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 at GOTPCREL(%rip), %rdi
 + 	jmp	pthread_getspecific at 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 at GOTPCREL(%rip), %rdi
 + 	jmp	pthread_getspecific at PLT
 + 
 + #elif defined(THREADS)
 
 --MP_/izcuzakYpiBpRHer2bssqdG--