This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

what if there's no __NR_oldmount nor __NR_mount?


This patch fixes linux/umount.S such that it doesn't fail to assemble
if an old-style umount syscall is not available at all.  Ok?

Index: ChangeLog
2003-03-14  Alexandre Oliva  <aoliva at redhat dot com>

	* sysdeps/unix/sysv/linux/umount.S: Don't assume at least one
	of oldumount and umount must exist.

Index: sysdeps/unix/sysv/linux/umount.S
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/umount.S,v
retrieving revision 1.3
diff -u -p -r1.3 umount.S
--- sysdeps/unix/sysv/linux/umount.S 20 Aug 1998 19:15:40 -0000 1.3
+++ sysdeps/unix/sysv/linux/umount.S 15 Jan 2003 15:30:21 -0000
@@ -2,11 +2,16 @@
    changes.  They simply rename old system calls.  */
 
 #include <sysdep.h>
-#ifdef __NR_oldumount
+
+#if defined __NR_oldumount || defined __NR_umount
+
+# ifdef __NR_oldumount
 PSEUDO (__umount, oldumount, 1)
-#else
+# else
 PSEUDO (__umount, umount, 1)
-#endif
+# endif
 	ret
 PSEUDO_END(__umount)
 weak_alias (__umount, umount)
+
+#endif /* defined __NR_oldumount || defined __NR_umount */
-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva at {redhat dot com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva at {lsd dot ic dot unicamp dot br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]