aboutsummaryrefslogtreecommitdiffstats
path: root/mps/code
diff options
context:
space:
mode:
authorRichard Brooksby2012-08-14 17:10:48 +0100
committerRichard Brooksby2012-08-14 17:10:48 +0100
commite9765e20d4a10142e68cb44b1929bdb73c265816 (patch)
tree79d98ed58f824a662a5420d2d4eb7a0052a380b1 /mps/code
parent15de8407ce3c8c75def9702a6287e79860e75f60 (diff)
downloademacs-e9765e20d4a10142e68cb44b1929bdb73c265816.tar.gz
emacs-e9765e20d4a10142e68cb44b1929bdb73c265816.zip
Renaming thli.c to thix.c as it is now general to posix threads.
Copied from Perforce Change: 178926 ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code')
-rw-r--r--mps/code/lii4gc.gmk2
-rw-r--r--mps/code/lii6gc.gmk2
-rw-r--r--mps/code/mps.c4
-rw-r--r--mps/code/thix.c (renamed from mps/code/thli.c)12
4 files changed, 6 insertions, 14 deletions
diff --git a/mps/code/lii4gc.gmk b/mps/code/lii4gc.gmk
index 6ed66a21f85..67664553fb2 100644
--- a/mps/code/lii4gc.gmk
+++ b/mps/code/lii4gc.gmk
@@ -5,7 +5,7 @@
5 5
6PFM = lii4gc 6PFM = lii4gc
7 7
8THREADSRC = lockli.c thli.c pthrdext.c 8THREADSRC = lockli.c thix.c pthrdext.c
9THREADLIB = -lpthread 9THREADLIB = -lpthread
10 10
11# _XOPEN_SOURCE is to get the modern POSIX signal handling 11# _XOPEN_SOURCE is to get the modern POSIX signal handling
diff --git a/mps/code/lii6gc.gmk b/mps/code/lii6gc.gmk
index d072f5f62fd..8f5be46c4a4 100644
--- a/mps/code/lii6gc.gmk
+++ b/mps/code/lii6gc.gmk
@@ -5,7 +5,7 @@
5 5
6PFM = lii6gc 6PFM = lii6gc
7 7
8THREADSRC = lockli.c thli.c pthrdext.c 8THREADSRC = lockli.c thix.c pthrdext.c
9THREADLIB = -lpthread 9THREADLIB = -lpthread
10 10
11# _XOPEN_SOURCE is to get the modern POSIX signal handling 11# _XOPEN_SOURCE is to get the modern POSIX signal handling
diff --git a/mps/code/mps.c b/mps/code/mps.c
index b2ddd0d2c1f..6de34a4dac0 100644
--- a/mps/code/mps.c
+++ b/mps/code/mps.c
@@ -124,7 +124,7 @@
124#elif defined(MPS_PF_LII4GC) 124#elif defined(MPS_PF_LII4GC)
125 125
126#include "lockli.c" /* Linux locks */ 126#include "lockli.c" /* Linux locks */
127#include "thli.c" /* Linux on 32-bit Intel threading */ 127#include "thix.c" /* Posix threading */
128#include "pthrdext.c" /* Posix thread extensions */ 128#include "pthrdext.c" /* Posix thread extensions */
129#include "vmix.c" /* Posix virtual memory */ 129#include "vmix.c" /* Posix virtual memory */
130#include "protix.c" /* Posix protection */ 130#include "protix.c" /* Posix protection */
@@ -139,7 +139,7 @@
139#elif defined(MPS_PF_LII6GC) 139#elif defined(MPS_PF_LII6GC)
140 140
141#include "lockli.c" /* Linux locks */ 141#include "lockli.c" /* Linux locks */
142#include "thli.c" /* Linux on 32-bit Intel threading */ 142#include "thix.c" /* Posix threading */
143#include "pthrdext.c" /* Posix thread extensions */ 143#include "pthrdext.c" /* Posix thread extensions */
144#include "vmix.c" /* Posix virtual memory */ 144#include "vmix.c" /* Posix virtual memory */
145#include "protix.c" /* Posix protection */ 145#include "protix.c" /* Posix protection */
diff --git a/mps/code/thli.c b/mps/code/thix.c
index 8073f6dbadf..5089f33f56e 100644
--- a/mps/code/thli.c
+++ b/mps/code/thix.c
@@ -1,4 +1,4 @@
1/* thli.c: Threads Manager for LinuxThreads 1/* thix.c: Threads Manager for Posix threads
2 * 2 *
3 * $Id$ 3 * $Id$
4 * Copyright (c) 2001 Ravenbrook Limited. See end of file for license. 4 * Copyright (c) 2001 Ravenbrook Limited. See end of file for license.
@@ -35,18 +35,10 @@
35#include "prmcix.h" 35#include "prmcix.h"
36#include "mpm.h" 36#include "mpm.h"
37 37
38#if !defined(MPS_OS_LI)
39#error "Compiling thli when MPS_OS_LI is not defined."
40#endif
41
42#if !(defined(MPS_ARCH_I4) || defined(MPS_ARCH_I6))
43#error "Need to check assumptions for thli.c are true for this architecture"
44#endif
45
46#include <pthread.h> 38#include <pthread.h>
47#include "pthrdext.h" 39#include "pthrdext.h"
48 40
49SRCID(thli, "$Id$"); 41SRCID(thix, "$Id$");
50 42
51 43
52/* ThreadStruct -- thread desriptor */ 44/* ThreadStruct -- thread desriptor */