svn commit: r390976 - in head/devel/libx86: . files

[Jung-uk Kim]

Author: jkim
Date: Tue Jun 30 17:42:22 2015
New Revision: 390976
URL: https://svnweb.freebsd.org/changeset/ports/390976

Log:
  Fix a regression when built with Clang.
  
  PR:		201165

Modified:
  head/devel/libx86/Makefile
  head/devel/libx86/files/patch-thunk.c

Modified: head/devel/libx86/Makefile
==============================================================================
--- head/devel/libx86/Makefile	Tue Jun 30 17:17:06 2015	(r390975)
+++ head/devel/libx86/Makefile	Tue Jun 30 17:42:22 2015	(r390976)
@@ -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

Modified: head/devel/libx86/files/patch-thunk.c
==============================================================================
--- head/devel/libx86/files/patch-thunk.c	Tue Jun 30 17:17:06 2015	(r390975)
+++ head/devel/libx86/files/patch-thunk.c	Tue Jun 30 17:42:22 2015	(r390976)
@@ -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;