[PATCH, committed] Sync libiberty from GCC (was: [PATCH, committed] Sync libiberty from GCC)

[Jan-Benedict Glaw <jbglaw at lug-owl dot de>]

On Tue, 2015-01-13 20:39:46 +0100, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Jan-Benedict Glaw <jbglaw@lug-owl.de> writes:
> > I synced libiberty from GCC.
> >
> > 2014-11-17  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
> >
> > libiberty/
> > 	* ChangeLog: Update from upstream libiberty.
[...]
> This is missing all the changes in include/libiberty.h, which is causing
> this error:
> 
> ../../libiberty/choose-temp.c: In function 'choose_temp_base':
> ../../libiberty/choose-temp.c:62:3: warning: implicit declaration of function 'choose_tmpdir' [-Wimplicit-function-declaration]
>    const char *base = choose_tmpdir ();
>    ^
> ../../libiberty/choose-temp.c:62:22: warning: initialization makes pointer from integer without a cast [enabled by default]
>    const char *base = choose_tmpdir ();

I'm sorry!  I missed include/libiberty.h when looking for stuff in
common (--> it's added to my comparison script.)

  The following patch (installed as obvious) updates libiberty.h and
appropriately adds missing changelog entries. (For one added
prototype, the matching changelog entry was actually already in
place.)


2015-01-14  Jan-Benedict Glaw  <jbglaw@lug-owl.de>

	* libiberty.h: Merge from GCC.


diff --git a/include/ChangeLog b/include/ChangeLog
index e0185fa..31f1e18 100644
--- 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 eec8009..b33dd65 100644
--- 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, ...);
 



-- 
      Jan-Benedict Glaw      jbglaw@lug-owl.de              +49-172-7608481
 Signature of:                    Don't believe in miracles: Rely on them!
 the second  :

Attachment: signature.asc
Description: Digital signature