Attachment 234353 Details for Bug 263845 – graphics/libglvnd: fix on armv7

[patch] graphics/libglvnd: fix on armv7

0001-graphics-libglvnd-fix-on-armv7.patch (text/plain), 1.97 KB, created by Robert Clausecker on 2022-05-31 17:20:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-05-31 17:20:19 UTC

Size: 1.97 KB

patch

obsolete

>From e3fb839c3adc8ee4564a04e7d79992506080d8ae Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Tue, 31 May 2022 19:15:44 +0200
>Subject: [PATCH] graphics/libglvnd: fix on armv7
>
>The .thumb_func directive does not switch to thumb mode in clang's
>integrated assembler.  This causes the code to be miscompiled in that
>it is generated as ARM code but the symbols are tagged as thumb.  The
>resulting library is unusable.  Every call into it crashes.
>
>Add a patch to fix the behaviour and bump PORTREVISION so consumers
>get the updated library.
>---
> graphics/libglvnd/Makefile                             |  2 +-
> .../patch-src_GLdispatch_vnd-glapi_entry__armv7__tsd.c | 10 ++++++++++
> 2 files changed, 11 insertions(+), 1 deletion(-)
> create mode 100644 graphics/libglvnd/files/patch-src_GLdispatch_vnd-glapi_entry__armv7__tsd.c
>
>diff --git a/graphics/libglvnd/Makefile b/graphics/libglvnd/Makefile
>index 5315970b50a8..9442852090b9 100644
>--- a/graphics/libglvnd/Makefile
>+++ b/graphics/libglvnd/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	libglvnd
> DISTVERSION=	1.4.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics
> 
> MAINTAINER=	x11@FreeBSD.org
>diff --git a/graphics/libglvnd/files/patch-src_GLdispatch_vnd-glapi_entry__armv7__tsd.c b/graphics/libglvnd/files/patch-src_GLdispatch_vnd-glapi_entry__armv7__tsd.c
>new file mode 100644
>index 000000000000..89c1c75f3f74
>--- /dev/null
>+++ b/graphics/libglvnd/files/patch-src_GLdispatch_vnd-glapi_entry__armv7__tsd.c
>@@ -0,0 +1,10 @@
>+--- src/GLdispatch/vnd-glapi/entry_armv7_tsd.c.orig	2022-05-31 14:43:08 UTC
>++++ src/GLdispatch/vnd-glapi/entry_armv7_tsd.c
>+@@ -60,6 +60,7 @@ __asm__(".syntax unified\n\t");
>+  */
>+ #define STUB_ASM_ENTRY(func)                        \
>+     ".balign " U_STRINGIFY(ENTRY_STUB_ALIGN) "\n\t" \
>++    ".thumb\n\t"                                    \
>+     ".thumb_func\n\t"                               \
>+     ".global " func "\n\t"                          \
>+     ".type " func ", %function\n\t"                 \
>-- 
>2.35.2
>

Actions: View | Diff

Attachments on bug 263845: 234353 | 234421