Re: [COMMITTED PATCH] Move tilegx, tilepro, and linux-generic from ports to libc.

["H.J. Lu" <hjl dot tools at gmail dot com>]

On Mon, Feb 10, 2014 at 7:54 AM, Chris Metcalf <cmetcalf@tilera.com> wrote:
> I've moved the TILE-Gx and TILEPro ports to the main sysdeps hierarchy,
> along with the linux-generic ports infrastructure.  Beyond the README
> update, the move was just
>
>     git mv ports/sysdeps/tile sysdeps/tile
>     git mv ports/sysdeps/unix/sysv/linux/tile \
>       sysdeps/unix/sysv/linux/tile
>     git mv ports/sysdeps/unix/sysv/linux/generic \
>       sysdeps/unix/sysv/linux/generic
>
> I updated the relevant ChangeLogs along the lines of the ARM move
> in commit c6bfe5c4d75 and tested the 64-bit tilegx build to confirm that
> there were no changes in "objdump -dr" output in the shared objects.
>
>
> ChangeLog:
>
> 2014-02-10  Chris Metcalf  <cmetcalf@tilera.com>
>
>         * sysdeps/tile: Move directory from ports/sysdeps/tile.
>         * sysdeps/unix/sysv/linux/generic: Move directory from
>         ports/sysdeps/unix/sysv/linux/generic.
>         * sysdeps/unix/sysv/linux/tile: Move directory from
>         ports/sysdeps/unix/sysv/linux/tile.
>         * README: Update listing for tile*-*-linux-gnu.
>
>
> ports/ChangeLog.linux-generic:
>
> This file describes changes to the linux-generic infrastructure while
> it was in the ports add-on directory.  This code is no longer maintained
> here and so future changes to it should be listed in the top-level
> ChangeLog file.
>
> 2014-02-10  Chris Metcalf  <cmetcalf@tilera.com>
>
>         * sysdeps/unix/sysv/linux/generic: Move directory to
>         ../sysdeps/unix/sysv/linux/generic.
>
>
> ports/ChangeLog.tile:
>
> This file describes changes to the TILE-Gx and TILEPro ports while they
> were in the ports add-on directory.  These ports are no longer part of
> an add-on and so future changes to them should be listed in the top-level
> ChangeLog file, not here.
>
> 2014-02-10  Chris Metcalf  <cmetcalf@tilera.com>
>
>         * sysdeps/tile: Move directory to ../sysdeps/tile.
>         * sysdeps/unix/sysv/linux/tile: Move directory to
>         ../sysdeps/unix/sysv/linux/tile.

Any particular reason to add

sysdeps/unix/sysv/linux/generic/bits/statfs.h

when there is

sysdeps/unix/sysv/linux/bits/statfs.h

already? Why can't it be used?  Here is a patch to remove it. OK
for master?

-- 
H.J.

From 5a8487ddd51e23b0786681ecbc86dc2b9081b5ae Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 18 Mar 2015 04:54:03 -0700
Subject: [PATCH] Remove sysdeps/unix/sysv/linux/generic/bits/statfs.h

sysdeps/unix/sysv/linux/generic/bits/statfs.h was added by

commit 4372980f5881e7d537a52e3c49588ce116088061
Author: Chris Metcalf <cmetcalf@tilera.com>
Date:   Mon Feb 10 10:54:47 2014 -0500

    Move tilegx, tilepro, and linux-generic from ports to libc.

    I've moved the TILE-Gx and TILEPro ports to the main sysdeps
hierarchy,
    along with the linux-generic ports infrastructure.  Beyond the
README
    update, the move was just

        git mv ports/sysdeps/tile sysdeps/tile
        git mv ports/sysdeps/unix/sysv/linux/tile \
          sysdeps/unix/sysv/linux/tile
        git mv ports/sysdeps/unix/sysv/linux/generic \
          sysdeps/unix/sysv/linux/generic

    I updated the relevant ChangeLogs along the lines of the ARM move
    in commit c6bfe5c4d75 and tested the 64-bit tilegx build to confirm
that
    there were no changes in "objdump -dr" output in the shared objects.

But there is sysdeps/unix/sysv/linux/bits/statfs.h already.  We should
update it if needed.
---
 sysdeps/unix/sysv/linux/generic/bits/statfs.h | 86 ---------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/generic/bits/statfs.h

diff --git a/sysdeps/unix/sysv/linux/generic/bits/statfs.h b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
deleted file mode 100644
index 363b7f8..0000000
--- a/sysdeps/unix/sysv/linux/generic/bits/statfs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 2011-2015 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
-
-   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/>.  */
-
-#ifndef _SYS_STATFS_H
-# error "Never include <bits/statfs.h> directly; use <sys/statfs.h> instead."
-#endif
-
-#include <endian.h>
-#include <bits/types.h>
-#include <bits/wordsize.h>
-
-/* 64-bit libc uses the kernel's 'struct statfs', accessed via the
-   statfs() syscall; 32-bit libc uses the kernel's 'struct statfs64'
-   and accesses it via the statfs64() syscall.  All the various
-   APIs offered by libc use the kernel shape for their struct statfs
-   structure; the only difference is that 32-bit programs not
-   using __USE_FILE_OFFSET64 only see the low 32 bits of some
-   of the fields (the __fsblkcnt_t and __fsfilcnt_t fields).  */
-
-#if defined __USE_FILE_OFFSET64
-# define __field64(type, type64, name) type64 name
-#elif __WORDSIZE == 64
-# define __field64(type, type64, name) type name
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-# define __field64(type, type64, name) \
-  type name __attribute__((__aligned__ (__alignof__ (type64)))); int __##name##_pad
-#else
-# define __field64(type, type64, name) \
-  int __##name##_pad __attribute__((__aligned__ (__alignof__ (type64)))); type name
-#endif
-
-struct statfs
-  {
-    __SWORD_TYPE f_type;
-    __SWORD_TYPE f_bsize;
-    __field64(__fsblkcnt_t, __fsblkcnt64_t, f_blocks);
-    __field64(__fsblkcnt_t, __fsblkcnt64_t, f_bfree);
-    __field64(__fsblkcnt_t, __fsblkcnt64_t, f_bavail);
-    __field64(__fsfilcnt_t, __fsfilcnt64_t, f_files);
-    __field64(__fsfilcnt_t, __fsfilcnt64_t, f_ffree);
-    __fsid_t f_fsid;
-    __SWORD_TYPE f_namelen;
-    __SWORD_TYPE f_frsize;
-    __SWORD_TYPE f_flags;
-    __SWORD_TYPE f_spare[4];
-  };
-
-#undef __field64
-
-#ifdef __USE_LARGEFILE64
-struct statfs64
-  {
-    __SWORD_TYPE f_type;
-    __SWORD_TYPE f_bsize;
-    __fsblkcnt64_t f_blocks;
-    __fsblkcnt64_t f_bfree;
-    __fsblkcnt64_t f_bavail;
-    __fsfilcnt64_t f_files;
-    __fsfilcnt64_t f_ffree;
-    __fsid_t f_fsid;
-    __SWORD_TYPE f_namelen;
-    __SWORD_TYPE f_frsize;
-    __SWORD_TYPE f_flags;
-    __SWORD_TYPE f_spare[4];
-  };
-#endif
-
-/* Tell code we have these members.  */
-#define _STATFS_F_NAMELEN
-#define _STATFS_F_FRSIZE
-#define _STATFS_F_FLAGS
-- 
2.1.0