3 files changed, 13 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/ftruncate64.c b/sysdeps/unix/sysv/linux/ftruncate64.c
index 17a5ab0288..6644b0523c 100644
--- a/sysdeps/unix/sysv/linux/ftruncate64.c
+++ b/sysdeps/unix/sysv/linux/ftruncate64.c
@@ -41,8 +41,9 @@ ftruncate64 (fd, length)
   if (! have_no_ftruncate64)
 #endif
     {
-      int result = INLINE_SYSCALL (ftruncate64, 3, fd, length >> 32,
-				   length & 0xffffffff);
+      unsigned int low = length & 0xffffffff;
+      unsigned int high = length >> 32;
+      int result = INLINE_SYSCALL (ftruncate64, 3, fd, low, high);
 
 #ifndef __ASSUME_TRUNCATE64_SYSCALL
       if (result != -1 || errno != ENOSYS)
diff --git a/sysdeps/unix/sysv/linux/i386/mmap64.S b/sysdeps/unix/sysv/linux/i386/mmap64.S
index 075c3f3345..916149a78a 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap64.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap64.S
@@ -21,6 +21,7 @@
 #include "kernel-features.h"
 
 #define EINVAL	22
+#define ENOSYS	38
 	
 	.text
 
@@ -36,11 +37,12 @@ ENTRY (__mmap64)
 
 	movl $SYS_ify(mmap2), %eax	/* System call number in %eax.  */
 
-	movl 40(%esp), %ebp
+	movl 40(%esp), %edx
 	movl 44(%esp), %ecx
-	shrld $12, %ecx, %ebp		/* mmap2 takes the offset in pages.  */
+	shrdl $12, %ecx, %edx		/* mmap2 takes the offset in pages.  */
 	shrl $12, %ecx
 	jne L(einval)
+	movl %edx, %ebp
 
 	movl 20(%esp), %ebx
 	movl 24(%esp), %ecx
@@ -68,8 +70,8 @@ L(pseudo_end):
 
 #ifndef __ASSUME_MMAP2_SYSCALL
 2:
-	cmp $-EINVAL, %eax
-	je 2f
+	cmp $-ENOSYS, %eax
+	je 3f
 #endif
 
 	/* This means the offset value is too large.  */
@@ -88,7 +90,7 @@ L(einval):
 	/* Save registers.  */
 	movl %ebx, %edx
 # endif
-
+3:
 	cmpl $0, 44(%esp)
 	jne L(einval)
 
diff --git a/sysdeps/unix/sysv/linux/truncate64.c b/sysdeps/unix/sysv/linux/truncate64.c
index 0a20547789..42b72731a9 100644
--- a/sysdeps/unix/sysv/linux/truncate64.c
+++ b/sysdeps/unix/sysv/linux/truncate64.c
@@ -41,8 +41,9 @@ truncate64 (path, length)
   if (! have_no_truncate64)
 #endif
     {
-      int result = INLINE_SYSCALL (truncate64, 3, path, length >> 32,
-				   length & 0xffffffff);
+      unsigned int low = length & 0xffffffff;
+      unsigned int high = length >> 32;
+      int result = INLINE_SYSCALL (truncate64, 3, path, low, high);
 
 #ifndef __ASSUME_TRUNCATE64_SYSCALL
       if (result != -1 || errno != ENOSYS)