From 57793cffdc0ca3d12910d1ba4a061b22b63c5345 Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Fri, 24 Aug 2007 20:37:09 +0000
Subject: [PATCH] gcc-4.3 compile fixes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6777
---
 coregrind/m_dispatch/dispatch-x86-linux.S | 10 +++++-----
 coregrind/m_syswrap/syscall-x86-linux.S   |  8 ++++----
 coregrind/m_trampoline.S                  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/coregrind/m_dispatch/dispatch-x86-linux.S b/coregrind/m_dispatch/dispatch-x86-linux.S
index 5cf10c493d..14895b3f7c 100644
--- a/coregrind/m_dispatch/dispatch-x86-linux.S
+++ b/coregrind/m_dispatch/dispatch-x86-linux.S
@@ -121,7 +121,7 @@ VG_(run_innerloop__dispatch_unprofiled):
 
 	/* try a fast lookup in the translation cache */
 	movl	%eax, %ebx			/* next guest addr */
-	andl	$VG_TT_FAST_MASK, %ebx		/* entry# */
+	andl	$ VG_TT_FAST_MASK, %ebx		/* entry# */
 	movl	0+VG_(tt_fast)(,%ebx,8), %esi	/* .guest */
 	movl	4+VG_(tt_fast)(,%ebx,8), %edi	/* .host */
 	cmpl	%eax, %esi
@@ -157,7 +157,7 @@ VG_(run_innerloop__dispatch_profiled):
 
 	/* try a fast lookup in the translation cache */
 	movl	%eax, %ebx			/* next guest addr */
-	andl	$VG_TT_FAST_MASK, %ebx		/* entry# */
+	andl	$ VG_TT_FAST_MASK, %ebx		/* entry# */
 	movl	0+VG_(tt_fast)(,%ebx,8), %esi	/* .guest */
 	movl	4+VG_(tt_fast)(,%ebx,8), %edi	/* .host */
 	cmpl	%eax, %esi
@@ -199,7 +199,7 @@ counter_is_zero:
 	/* %EIP is up to date here */
 	/* back out decrement of the dispatch counter */
 	addl	$1, VG_(dispatch_ctr)
-	movl	$VG_TRC_INNER_COUNTERZERO, %eax
+	movl	$ VG_TRC_INNER_COUNTERZERO, %eax
 	jmp	run_innerloop_exit
 	/*NOTREACHED*/
 
@@ -207,7 +207,7 @@ fast_lookup_failed:
 	/* %EIP is up to date here */
 	/* back out decrement of the dispatch counter */
 	addl	$1, VG_(dispatch_ctr)
-	movl	$VG_TRC_INNER_FASTMISS, %eax
+	movl	$ VG_TRC_INNER_FASTMISS, %eax
 	jmp	run_innerloop_exit
 	/*NOTREACHED*/
 
@@ -240,7 +240,7 @@ L2:	/* otherwise we're OK */
 	jmp	run_innerloop_exit_REALLY
 
 invariant_violation:
-	movl	$VG_TRC_INVARIANT_FAILED, %eax
+	movl	$ VG_TRC_INVARIANT_FAILED, %eax
 	jmp	run_innerloop_exit_REALLY
 
 run_innerloop_exit_REALLY:
diff --git a/coregrind/m_syswrap/syscall-x86-linux.S b/coregrind/m_syswrap/syscall-x86-linux.S
index bcfaf39a40..1c3f47076f 100644
--- a/coregrind/m_syswrap/syscall-x86-linux.S
+++ b/coregrind/m_syswrap/syscall-x86-linux.S
@@ -88,8 +88,8 @@ ML_(do_syscall_for_client_WRK):
 	   If eip is in the range [1,2), the syscall hasn't been started yet */
 
 	/* Set the signal mask which should be current during the syscall. */
-	movl	$__NR_rt_sigprocmask, %eax
-	movl	$VKI_SIG_SETMASK, %ebx
+	movl	$ __NR_rt_sigprocmask, %eax
+	movl	$ VKI_SIG_SETMASK, %ebx
 	movl	8+FSZ(%esp), %ecx
 	movl	12+FSZ(%esp), %edx
 	movl	16+FSZ(%esp), %esi
@@ -117,8 +117,8 @@ ML_(do_syscall_for_client_WRK):
 
 4:	/* Re-block signals.  If eip is in [4,5), then the syscall is complete and 
 	   we needn't worry about it. */
-	movl	$__NR_rt_sigprocmask, %eax
-	movl	$VKI_SIG_SETMASK, %ebx
+	movl	$ __NR_rt_sigprocmask, %eax
+	movl	$ VKI_SIG_SETMASK, %ebx
 	movl	12+FSZ(%esp), %ecx
 	xorl	%edx, %edx
 	movl	16+FSZ(%esp), %esi
diff --git a/coregrind/m_trampoline.S b/coregrind/m_trampoline.S
index 4ae58e15e0..daf25dd73a 100644
--- a/coregrind/m_trampoline.S
+++ b/coregrind/m_trampoline.S
@@ -67,14 +67,14 @@ VG_(x86_linux_SUBST_FOR_sigreturn):
            x86_fallback_frame_state() in
            gcc-4.1.0/gcc/config/i386/linux-unwind.h */
         popl    %eax
-        movl    $__NR_sigreturn, %eax
+        movl    $ __NR_sigreturn, %eax
         int     $0x80
         ud2
 
 .global VG_(x86_linux_SUBST_FOR_rt_sigreturn)
 VG_(x86_linux_SUBST_FOR_rt_sigreturn):
         /* Likewise for rt signal frames */
-        movl    $__NR_rt_sigreturn, %eax
+        movl    $ __NR_rt_sigreturn, %eax
         int     $0x80
         ud2
 
-- 
2.47.2