Revert "Update gnulib to current upstream master"

[deliverable/binutils-gdb.git] / gdb / gnulib / import / m4 / stat.m4

diff --git a/gdb/gnulib/import/m4/stat.m4 b/gdb/gnulib/import/m4/stat.m4
index e8ec3b2b966902813ca9a6349c532eb937279596..a794975de9c3334b242404ac9ac7a5eca098e50c 100644 (file)
--- a/gdb/gnulib/import/m4/stat.m4
+++ b/gdb/gnulib/import/m4/stat.m4
@@ -1,6 +1,6 @@
-# serial 15
+# serial 11
 
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8,67 +8,64 @@
 
 AC_DEFUN([gl_FUNC_STAT],
 [
-  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([lstat])
-  case "$host_os" in
-    mingw*)
-      dnl On this platform, the original stat() returns st_atime, st_mtime,
-      dnl st_ctime values that are affected by the time zone.
-      REPLACE_STAT=1
-      ;;
-    *)
-      dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
-      dnl (For mingw, this is due to a broken stat() override in libmingwex.a.)
-      dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/").
-      AC_CACHE_CHECK([whether stat handles trailing slashes on files],
-        [gl_cv_func_stat_file_slash],
-        [touch conftest.tmp
-         # Assume that if we have lstat, we can also check symlinks.
-         if test $ac_cv_func_lstat = yes; then
-           ln -s conftest.tmp conftest.lnk
-         fi
-         AC_RUN_IFELSE(
-           [AC_LANG_PROGRAM(
-             [[#include <sys/stat.h>
+  dnl mingw is the only known platform where stat(".") and stat("./") differ
+  AC_CACHE_CHECK([whether stat handles trailing slashes on directories],
+      [gl_cv_func_stat_dir_slash],
+      [AC_RUN_IFELSE(
+         [AC_LANG_PROGRAM(
+           [[#include <sys/stat.h>
+]], [[struct stat st; return stat (".", &st) != stat ("./", &st);]])],
+         [gl_cv_func_stat_dir_slash=yes], [gl_cv_func_stat_dir_slash=no],
+         [case $host_os in
+            mingw*) gl_cv_func_stat_dir_slash="guessing no";;
+            *) gl_cv_func_stat_dir_slash="guessing yes";;
+          esac])])
+  dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
+  dnl (For mingw, this is due to a broken stat() override in libmingwex.a.)
+  dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/").
+  AC_CACHE_CHECK([whether stat handles trailing slashes on files],
+      [gl_cv_func_stat_file_slash],
+      [touch conftest.tmp
+       # Assume that if we have lstat, we can also check symlinks.
+       if test $ac_cv_func_lstat = yes; then
+         ln -s conftest.tmp conftest.lnk
+       fi
+       AC_RUN_IFELSE(
+         [AC_LANG_PROGRAM(
+           [[#include <sys/stat.h>
 ]], [[int result = 0;
-               struct stat st;
-               if (!stat ("conftest.tmp/", &st))
-                 result |= 1;
+      struct stat st;
+      if (!stat ("conftest.tmp/", &st))
+        result |= 1;
 #if HAVE_LSTAT
-               if (!stat ("conftest.lnk/", &st))
-                 result |= 2;
+      if (!stat ("conftest.lnk/", &st))
+        result |= 2;
 #endif
-               return result;
-             ]])],
-           [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
-           [case "$host_os" in
-                               # Guess yes on Linux systems.
-              linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;;
-                               # Guess yes on glibc systems.
-              *-gnu* | gnu*)   gl_cv_func_stat_file_slash="guessing yes" ;;
-                               # If we don't know, assume the worst.
-              *)               gl_cv_func_stat_file_slash="guessing no" ;;
-            esac
-           ])
-         rm -f conftest.tmp conftest.lnk])
-      case $gl_cv_func_stat_file_slash in
-        *no)
-          REPLACE_STAT=1
-          AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
-            help when passed a file name with a trailing slash]);;
-      esac
-      case $host_os in
-        dnl Solaris stat can return a negative tv_nsec.
-        solaris*)
-          REPLACE_FSTAT=1 ;;
-      esac
-      ;;
+      return result;
+           ]])],
+         [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
+         [case "$host_os" in
+                    # Guess yes on glibc systems.
+            *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;;
+                    # If we don't know, assume the worst.
+            *)      gl_cv_func_stat_file_slash="guessing no" ;;
+          esac
+         ])
+       rm -f conftest.tmp conftest.lnk])
+  case $gl_cv_func_stat_dir_slash in
+    *no) REPLACE_STAT=1
+      AC_DEFINE([REPLACE_FUNC_STAT_DIR], [1], [Define to 1 if stat needs
+        help when passed a directory name with a trailing slash]);;
+  esac
+  case $gl_cv_func_stat_file_slash in
+    *no) REPLACE_STAT=1
+      AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
+        help when passed a file name with a trailing slash]);;
   esac
 ])
 
-# Prerequisites of lib/stat.c and lib/stat-w32.c.
-AC_DEFUN([gl_PREREQ_STAT], [
-  AC_REQUIRE([gl_HEADER_SYS_STAT_H])
-  :
-])
+# Prerequisites of lib/stat.c.
+AC_DEFUN([gl_PREREQ_STAT], [:])