about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-14 01:51:28 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-14 01:51:28 +0000
commita8ef1b608b2ee8e250ba5430e7930ae3e75d3b6e (patch)
tree77036de0413a4fe353594dc43091a9de7eb50b7d /sysdeps/unix
parentc456edaaac362c1764f0631d7730eea62c43a157 (diff)
downloadglibc-a8ef1b608b2ee8e250ba5430e7930ae3e75d3b6e.tar.gz
glibc-a8ef1b608b2ee8e250ba5430e7930ae3e75d3b6e.tar.xz
glibc-a8ef1b608b2ee8e250ba5430e7930ae3e75d3b6e.zip
Update.
2000-01-13  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/i386/mmap64.S: Fix code generated if
	mmap2 is available when compiling but no at runtime.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/i386/mmap64.S12
1 files changed, 4 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/mmap64.S b/sysdeps/unix/sysv/linux/i386/mmap64.S
index 22515a11d2..3228420665 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap64.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap64.S
@@ -87,22 +87,17 @@ L(einval):
 #endif
 
 #if !defined __ASSUME_MMAP2_SYSCALL || !defined __NR_mmap2
-
 3:
 	/* Save registers.  */
 	movl %ebx, %edx
 
 	cmpl $0, 28(%esp)
-	jne L(einval)
+	jne L(einval2)
 
 	movl $SYS_ify(mmap), %eax	/* System call number in %eax.  */
 
 	lea 4(%esp), %ebx		/* Address of args is 1st arg.  */
 
-# ifdef __NR_mmap2
-	jmp L(do_syscall)
-# else
-
 	/* Do the system call trap.  */
 	int $0x80
 
@@ -114,14 +109,15 @@ L(einval):
 	ja SYSCALL_ERROR_LABEL
 
 	/* Successful; return the syscall's value.  */
+#ifndef __NR_mmap2
 L(pseudo_end):
+#endif
 	ret
 
-L(einval):
+L(einval2):
 	movl %edx, %ebx
 	movl $-EINVAL, %eax
 	jmp SYSCALL_ERROR_LABEL
-# endif
 #endif
 
 PSEUDO_END (__mmap64)