[rtems-tools commit] rtemstoolkit/libiberty: Fix broken configure detection.

Chris Johns chrisj at rtems.org
Sun Aug 20 07:22:28 UTC 2017


Module:    rtems-tools
Branch:    master
Commit:    f2bb43913b129209934dcbf1db4eb0beea8275e3
Changeset: http://git.rtems.org/rtems-tools/commit/?id=f2bb43913b129209934dcbf1db4eb0beea8275e3

Author:    Chris Johns <chrisj at rtems.org>
Date:      Sun Aug 20 17:19:06 2017 +1000

rtemstoolkit/libiberty: Fix broken configure detection.

The file libiberty.h requires some configure macros to control some parts
and these are not provided so the file did not match what was needed. Hard
code the result and remove the need for the macros. The related calls
are not provided in our libiberty usage and not needed.

Closes #3103.

---

 rtemstoolkit/libiberty/libiberty.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rtemstoolkit/libiberty/libiberty.h b/rtemstoolkit/libiberty/libiberty.h
index a0cbbcf..102b0f9 100644
--- a/rtemstoolkit/libiberty/libiberty.h
+++ b/rtemstoolkit/libiberty/libiberty.h
@@ -1,7 +1,7 @@
 /* Function declarations for libiberty.
 
    Copyright (C) 1997-2017 Free Software Foundation, Inc.
-   
+
    Note - certain prototypes declared in this header file are for
    functions whoes implementation copyright does not belong to the
    FSF.  Those prototypes are present in this file for reference
@@ -23,7 +23,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street - Fifth Floor,
    Boston, MA 02110-1301, USA.
-   
+
    Written by Cygnus Support, 1994.
 
    The libiberty library provides a number of functions which are
@@ -104,11 +104,11 @@ extern int countargv (char * const *);
    declaration without arguments.  If it is 0, we checked and failed
    to find the declaration so provide a fully prototyped one.  If it
    is 1, we found it so don't provide any declaration at all.  */
-#if !HAVE_DECL_BASENAME
+#if REMOVED_FOR_RTEMS_TOOLS && !HAVE_DECL_BASENAME
 #if defined (__GNU_LIBRARY__ ) || defined (__linux__) \
  || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) \
  || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) \
- || defined (__DragonFly__) || defined (HAVE_DECL_BASENAME) 
+ || defined (__DragonFly__) || defined (HAVE_DECL_BASENAME)
 extern char *basename (const char *) ATTRIBUTE_RETURNS_NONNULL ATTRIBUTE_NONNULL(1);
 #else
 /* Do not allow basename to be used if there is no prototype seen.  We
@@ -206,7 +206,7 @@ extern char * getpwd (void);
 #ifdef __MINGW32__
 /* Forward declaration to avoid #include <sys/time.h>.   */
 struct timeval;
-extern int gettimeofday (struct timeval *, void *); 
+extern int gettimeofday (struct timeval *, void *);
 #endif
 
 /* Get the amount of time the process has run, in microseconds.  */
@@ -451,7 +451,7 @@ extern struct pex_obj *pex_init (int flags, const char *pname,
 /* Capture stderr to a pipe.  The output can be read by
    calling pex_read_err and reading from the returned
    FILE object.  This flag may be specified only for
-   the last program in a pipeline.  
+   the last program in a pipeline.
 
    This flag is supported only on Unix and Windows.  */
 #define PEX_STDERR_TO_PIPE	0x40
@@ -644,7 +644,7 @@ extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
 
 extern char *xasprintf (const char *, ...) ATTRIBUTE_MALLOC ATTRIBUTE_PRINTF_1;
 
-#if !HAVE_DECL_VASPRINTF
+#if REMOVED_FOR_RTEMS_TOOLS && !HAVE_DECL_VASPRINTF
 /* Like vsprintf but provides a pointer to malloc'd storage, which
    must be freed by the caller.  */
 




More information about the vc mailing list