aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2004-11-24 04:33:22 +0000
committerAndreas Jaeger <aj@suse.de>2004-11-24 04:33:22 +0000
commitcdb7b96289c0605afe393a69a5865a1cedf072dc (patch)
tree2542fa88a190dd99b031b5a243712cc71292dffe
parent42586dce0327cd294aa28dc74a2d73eb1c10da88 (diff)
downloadglibc-cdb7b96289c0605afe393a69a5865a1cedf072dc.tar
glibc-cdb7b96289c0605afe393a69a5865a1cedf072dc.tar.gz
glibc-cdb7b96289c0605afe393a69a5865a1cedf072dc.tar.bz2
glibc-cdb7b96289c0605afe393a69a5865a1cedf072dc.zip
Include <sgidefs.h>. Use _ABIO32, _ABIN32 and _ABI64 for ABI selection throughout.
-rw-r--r--linuxthreads/sysdeps/mips/pspinlock.c3
-rw-r--r--linuxthreads/sysdeps/mips/pt-machine.h9
2 files changed, 6 insertions, 6 deletions
diff --git a/linuxthreads/sysdeps/mips/pspinlock.c b/linuxthreads/sysdeps/mips/pspinlock.c
index b04b9ffea9..350aa7553c 100644
--- a/linuxthreads/sysdeps/mips/pspinlock.c
+++ b/linuxthreads/sysdeps/mips/pspinlock.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include <pthread.h>
+#include <sgidefs.h>
#include <sys/tas.h>
#include "internals.h"
@@ -34,7 +35,7 @@ __pthread_spin_lock (pthread_spinlock_t *lock)
("\t\t\t# spin_lock\n"
"1:\n\t"
".set push\n\t"
-#if _MIPS_SIM == _MIPS_SIM_ABI32
+#if _MIPS_SIM == _ABIO32
".set mips2\n\t"
#endif
"ll %1,%3\n\t"
diff --git a/linuxthreads/sysdeps/mips/pt-machine.h b/linuxthreads/sysdeps/mips/pt-machine.h
index c2f448e4be..96f7a7f8c6 100644
--- a/linuxthreads/sysdeps/mips/pt-machine.h
+++ b/linuxthreads/sysdeps/mips/pt-machine.h
@@ -24,9 +24,8 @@
#ifndef _PT_MACHINE_H
#define _PT_MACHINE_H 1
-#include <sys/tas.h>
-
#include <sgidefs.h>
+#include <sys/tas.h>
#ifndef PT_EI
# define PT_EI extern inline __attribute__ ((always_inline))
@@ -63,10 +62,10 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
("/* Inline compare & swap */\n"
"1:\n\t"
".set push\n\t"
-#if _MIPS_SIM == _MIPS_SIM_ABI32
+#if _MIPS_SIM == _ABIO32
".set mips2\n\t"
#endif
-#if _MIPS_SIM == _MIPS_SIM_ABI64
+#if _MIPS_SIM == _ABI64
"lld %1,%5\n\t"
#else
"ll %1,%5\n\t"
@@ -74,7 +73,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
"move %0,$0\n\t"
"bne %1,%3,2f\n\t"
"move %0,%4\n\t"
-#if _MIPS_SIM == _MIPS_SIM_ABI64
+#if _MIPS_SIM == _ABI64
"scd %0,%2\n\t"
#else
"sc %0,%2\n\t"