Warn if add-symbol-file does not provide any symbols

[deliverable/binutils-gdb.git] / gdb / gnulib / import / canonicalize-lgpl.c

diff --git a/gdb/gnulib/import/canonicalize-lgpl.c b/gdb/gnulib/import/canonicalize-lgpl.c
index 7831b3f19c345d20a8a92d870453ef1d39875741..4b1f6cb40ffbc9cd112331d1ce3af0b318431cec 100644 (file)
--- a/gdb/gnulib/import/canonicalize-lgpl.c
+++ b/gdb/gnulib/import/canonicalize-lgpl.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2018 Free Software Foundation, Inc.
+   Copyright (C) 1996-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
@@ -59,10 +59,8 @@
      */
 #   undef getcwd
 #  endif
-#  if defined VMS && !defined getcwd
-    /* We want the directory in Unix syntax, not in VMS syntax.
-       The gnulib override of 'getcwd' takes 2 arguments; the original VMS
-       'getcwd' takes 3 arguments.  */
+#  ifdef VMS
+    /* We want the directory in Unix syntax, not in VMS syntax.  */
 #   define __getcwd(buf, max) getcwd (buf, max, 0)
 #  else
 #   define __getcwd getcwd
@@ -95,9 +93,9 @@
 static void
 alloc_failed (void)
 {
-#if defined _WIN32 && ! defined __CYGWIN__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   /* Avoid errno problem without using the malloc or realloc modules; see:
-     https://lists.gnu.org/r/bug-gnulib/2016-08/msg00025.html  */
+     http://lists.gnu.org/archive/html/bug-gnulib/2016-08/msg00025.html  */
   errno = ENOMEM;
 #endif
 }
@@ -270,8 +268,6 @@ __realpath (const char *name, char *resolved)
 #endif
           *dest = '\0';
 
-          /* FIXME: if lstat fails with errno == EOVERFLOW,
-             the entry exists.  */
 #ifdef _LIBC
           if (__lxstat64 (_STAT_VER, rpath, &st) < 0)
 #else