Merge include/libiberty.h from GCC

This pulls in some missing prototypes and also adds corresponding entries
to the ChangeLog file. Please note that for one function, strverscmp(),
the ChangeLog entry was already there, but the actual prototype wasn't.

  These ChangeLog entries are added:

	2014-10-28  Yury Gribov  <y.gribov@samsung.com>

	       * libiberty.h (strtol, strtoul, strtoll, strtoull): New prototypes.

	2014-10-15  David Malcolm  <dmalcolm@redhat.com>

	       * libiberty.h (choose_tmpdir): New prototype.

diff --git a/include/ChangeLog b/include/ChangeLog
index e0185faa3e5079f8c3de9257d9e1745a5329e360..31f1e18093ea94da43c152a415b87fe0272a9602 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-14  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+       * libiberty.h: Merge from GCC.
+
 2015-01-01  Alan Modra  <amodra@gmail.com>
 
        Update year range in copyright notice of all files.
@@ -68,10 +72,18 @@
        * elf/mips.h (AFL_EXT_OCTEON3): Define.
        INSN_OCTEON3, CPU_OCTEON3): Define.
 
+2014-10-28  Yury Gribov  <y.gribov@samsung.com>
+
+       * libiberty.h (strtol, strtoul, strtoll, strtoull): New prototypes.
+
 2014-10-22  Matthew Fortune  <matthew.fortune@imgtec.com>
 
        * elf/mips.h (AFL_ASE_MASK): Define.
 
+2014-10-15  David Malcolm  <dmalcolm@redhat.com>
+
+       * libiberty.h (choose_tmpdir): New prototype.
+
 2014-09-26  Max Ostapenko  <m.ostapenko@partner.samsung.com>
 
        * libiberty.h (PEX_STDOUT_APPEND): New flag.

diff --git a/include/libiberty.h b/include/libiberty.h
index eec8009cc2dd93cc2b01389d63d90e7969c2ca0f..b33dd65982d4b206ee5fb011a8d3630e6011fcc5 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -226,6 +226,11 @@ extern char *make_relative_prefix (const char *, const char *,
 extern char *make_relative_prefix_ignore_links (const char *, const char *,
                                                const char *) ATTRIBUTE_MALLOC;
 
+/* Returns a pointer to a directory path suitable for creating temporary
+   files in.  */
+
+extern const char *choose_tmpdir (void) ATTRIBUTE_RETURNS_NONNULL;
+
 /* Choose a temporary directory to use for scratch files.  */
 
 extern char *choose_temp_base (void) ATTRIBUTE_MALLOC ATTRIBUTE_RETURNS_NONNULL;
@@ -659,6 +664,33 @@ extern size_t strnlen (const char *, size_t);
 extern int strverscmp (const char *, const char *);
 #endif
 
+#if defined(HAVE_DECL_STRTOL) && !HAVE_DECL_STRTOL
+extern long int strtol (const char *nptr,
+                        char **endptr, int base);
+#endif
+
+#if defined(HAVE_DECL_STRTOUL) && !HAVE_DECL_STRTOUL
+extern unsigned long int strtoul (const char *nptr,
+                                  char **endptr, int base);
+#endif
+
+#if defined(HAVE_LONG_LONG) && defined(HAVE_DECL_STRTOLL) && !HAVE_DECL_STRTOLL
+__extension__
+extern long long int strtoll (const char *nptr,
+                              char **endptr, int base);
+#endif
+
+#if defined(HAVE_LONG_LONG) && defined(HAVE_DECL_STRTOULL) && !HAVE_DECL_STRTOULL
+__extension__
+extern unsigned long long int strtoull (const char *nptr,
+                                        char **endptr, int base);
+#endif
+
+#if defined(HAVE_DECL_STRVERSCMP) && !HAVE_DECL_STRVERSCMP
+/* Compare version strings.  */
+extern int strverscmp (const char *, const char *);
+#endif
+
 /* Set the title of a process */
 extern void setproctitle (const char *name, ...);