diff options
| author | jkim <jkim@FreeBSD.org> | 2015-07-01 01:42:22 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-07-01 01:42:22 +0800 |
| commit | 37ce4afb492725ded74d8a758633b7a6c47563af (patch) | |
| tree | f181b4acfbc1b84b6588d8330fcc6eb8fa12667b /devel | |
| parent | 6d579d44b6833eebed4be81cfa3b451a106bb7e1 (diff) | |
| download | freebsd-ports-gnome-37ce4afb492725ded74d8a758633b7a6c47563af.tar.gz freebsd-ports-gnome-37ce4afb492725ded74d8a758633b7a6c47563af.tar.zst freebsd-ports-gnome-37ce4afb492725ded74d8a758633b7a6c47563af.zip | |
Fix a regression when built with Clang.
PR: 201165
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libx86/Makefile | 2 | ||||
| -rw-r--r-- | devel/libx86/files/patch-thunk.c | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/devel/libx86/Makefile b/devel/libx86/Makefile index 88d44e5e4707..6e9b775defe0 100644 --- a/devel/libx86/Makefile +++ b/devel/libx86/Makefile @@ -2,7 +2,7 @@ PORTNAME= libx86 PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.codon.org.uk/~mjg59/libx86/downloads/ \ LOCAL/jkim diff --git a/devel/libx86/files/patch-thunk.c b/devel/libx86/files/patch-thunk.c index 13d868c5bd32..a4892d5d28b1 100644 --- a/devel/libx86/files/patch-thunk.c +++ b/devel/libx86/files/patch-thunk.c @@ -1,5 +1,5 @@ ---- thunk.c 2008-04-02 20:48:00.000000000 -0400 -+++ thunk.c 2008-12-03 19:19:25.000000000 -0500 +--- thunk.c.orig 2008-04-03 00:48:00 UTC ++++ thunk.c @@ -11,7 +11,9 @@ #include <unistd.h> #include <stdlib.h> @@ -10,3 +10,14 @@ #include <string.h> #include <sys/ipc.h> #include <sys/shm.h> +@@ -169,8 +171,8 @@ int LRMI_init() { + X86_ESP = 0xFFF9; + memset (stack, 0, 64*1024); + +- *((char *)0) = 0x4f; /* Make sure that we end up jumping back to a +- halt instruction */ ++ *((volatile char *)0) = 0x4f; /* Make sure that we end up jumping back to a ++ halt instruction */ + + M.mem_base = 0; + M.mem_size = 1024*1024; |