Move shared umount.c from hppa to mips.

This patch prepares for moving mips from ports to libc by reversing
the #include ordering between mips and hppa.

Reversing #include ordering for umount.c is the conservative change in
preparation for moving the mips port.  In fact, it appears there are
several redundant umount.c files all implementing umount in terms of
the umount2 syscall; I've filed bug 16552 for eliminating that
redundancy properly.

Tested that disassembly of shared libraries for mips (o32, n32, n64)
is the same before and after this patch.

	* sysdeps/unix/sysv/linux/hppa/umount.c: Move to
	sysdeps/unix/sysv/linux/mips/mips64/umount.c and #include that
	file.

	* sysdeps/unix/sysv/linux/mips/mips64/umount.c: Move from
	sysdeps/unix/sysv/linux/hppa/umount.c instead of #include of that
	file.

diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa
index 24ae46e528744ea01f58fc57451f5b6feccb0a67..9d784aa301ffd15c8b8d1e0d92ac575fba448fb3 100644 (file)
--- a/ports/ChangeLog.hppa
+++ b/ports/ChangeLog.hppa
@@ -1,3 +1,9 @@
+2014-02-10  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/hppa/umount.c: Move to
+       sysdeps/unix/sysv/linux/mips/mips64/umount.c and #include that
+       file.
+
 2014-02-03  Carlos O'Donell  <carlos@redhat.com>
 
        * sysdeps/hppa/fpu/libm-test-ulps: Regenerate.

diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index e8d2ee024ef589bc8e0ae917b50b22d01f02dd0f..fc6c38612d4e1082ff93f8905d3f4c4840dabf83 100644 (file)
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,9 @@
+2014-02-10  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/mips/mips64/umount.c: Move from
+       sysdeps/unix/sysv/linux/hppa/umount.c instead of #include of that
+       file.
+
 2014-02-10  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/mips/ipc_priv.h: Directly include

diff --git a/ports/sysdeps/unix/sysv/linux/hppa/umount.c b/ports/sysdeps/unix/sysv/linux/hppa/umount.c
index b8e499d8c4710a4b914710b5f1f2f9a8867c6c90..208fbec994b351ac648b1c4ab52f4c6c606c40cb 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/hppa/umount.c
+++ b/ports/sysdeps/unix/sysv/linux/hppa/umount.c
@@ -1,30 +1 @@
-/* Copyright (C) 2000-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by David Huggins-Daines <dhd@debian.org>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Since we don't have an oldumount system call, do what the kernel
-   does down here.  */
-
-extern long int __umount2 (const char *name, int flags);
-
-long int
-__umount (const char *name)
-{
-  return __umount2 (name, 0);
-}
-
-weak_alias (__umount, umount);
+#include <sysdeps/unix/sysv/linux/mips/mips64/umount.c>

diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/umount.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/umount.c
index 9a91ba5b2f369156b4b5a6c8edcfc2193d69adf7..b8e499d8c4710a4b914710b5f1f2f9a8867c6c90 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/mips/mips64/umount.c
+++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/umount.c
@@ -1 +1,30 @@
-#include <sysdeps/unix/sysv/linux/hppa/umount.c>
+/* Copyright (C) 2000-2014 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by David Huggins-Daines <dhd@debian.org>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* Since we don't have an oldumount system call, do what the kernel
+   does down here.  */
+
+extern long int __umount2 (const char *name, int flags);
+
+long int
+__umount (const char *name)
+{
+  return __umount2 (name, 0);
+}
+
+weak_alias (__umount, umount);