merge from gcc

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 8cdf161..4daf9ec 100644 (file)
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-13  Janis Johnson  <janis187@us.ibm.com>
+
+       PR c/41046
+       * decContext.c (decContextTestEndian): Call printf only if DECCHECK.
+       * decCommon.c ( decFloatShow): Define function only for DECCHECK
+       or DECTRACE.
+
 2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.in (aclocal_deps): New variable.

diff --git a/libdecnumber/decCommon.c b/libdecnumber/decCommon.c
index 192b5cf..add1f2e 100644 (file)
--- a/libdecnumber/decCommon.c
+++ b/libdecnumber/decCommon.c
@@ -1157,6 +1157,7 @@ uInt decFloatRadix(const decFloat *df) {
   return 10;
   } /* decFloatRadix */
 
+#if (DECCHECK || DECTRACE)
 /* ------------------------------------------------------------------ */
 /* decFloatShow -- printf a decFloat in hexadecimal and decimal       */
 /*   df  is the decFloat to show                                     */
@@ -1183,6 +1184,7 @@ void decFloatShow(const decFloat *df, const char *tag) {
   printf(">%s> %s [big-endian] %s\n", tag, hexbuf, buff);
   return;
   } /* decFloatShow */
+#endif
 
 /* ------------------------------------------------------------------ */
 /* decFloatToBCD -- get sign, exponent, and BCD8 from a decFloat      */

diff --git a/libdecnumber/decContext.c b/libdecnumber/decContext.c
index 28bbdbb..1756dcb 100644 (file)
--- a/libdecnumber/decContext.c
+++ b/libdecnumber/decContext.c
@@ -31,7 +31,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 /* ------------------------------------------------------------------ */
 
 #include <string.h>          /* for strcmp */
+#ifdef DECCHECK
 #include <stdio.h>           /* for printf if DECCHECK */
+#endif
 #include "dconfig.h"         /* for GCC definitions */
 #include "decContext.h"       /* context and base types */
 #include "decNumberLocal.h"   /* decNumber local types, etc. */
@@ -395,8 +397,10 @@ Int decContextTestEndian(Flag quiet) {
     if (!quiet) {
       if (LITEND) adj="little";
             else adj="big";
+#if DECCHECK
       printf("Warning: DECLITEND is set to %d, but this computer appears to be %s-endian\n",
             DECLITEND, adj);
+#endif
       }
     res=(Int)LITEND-dle;
     }

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 16f541e..b2f4120 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.in (AUTOCONF, configure_deps): New variables.
+       ($(srcdir)/configure): New rule, active only in maintainer mode.
+
 2009-07-29  Douglas B Rupp  <rupp@gnat.com>
 
        * make-temp-file.c (choose_tmpdir): Try standard temp logical on VMS.

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 20a7210..e8f4f4d 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -459,6 +459,16 @@ stamp-h: $(srcdir)/config.in config.status Makefile
 config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 
+AUTOCONF = autoconf
+configure_deps = $(srcdir)/aclocal.m4 \
+       $(srcdir)/../config/acx.m4 \
+       $(srcdir)/../config/no-executables.m4 \
+       $(srcdir)/../config/override.m4 \
+       $(srcdir)/../config/warnings.m4 \
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps)
+       cd $(srcdir) && $(AUTOCONF)
+
 # Depending on config.h makes sure that config.status has been re-run
 # if needed.  This prevents problems with parallel builds, in case
 # subdirectories need to run config.status also.