merge from gcc

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 138aa6e..87e7e11 100644 (file)
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       Update copyright years.
+
 2012-11-04  Thomas Schwinge  <thomas@codesourcery.com>
 
        * configure: Regenerate.

diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in
index c64f22c..e67ff27 100644 (file)
--- a/libdecnumber/Makefile.in
+++ b/libdecnumber/Makefile.in
@@ -1,8 +1,7 @@
 # @configure_input@
 # Makefile for libdecnumber.  Run 'configure' to generate Makefile from Makefile.in
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 

diff --git a/libdecnumber/bid/bid-dpd.h b/libdecnumber/bid/bid-dpd.h
index e100cc9..3889bca 100644 (file)
--- a/libdecnumber/bid/bid-dpd.h
+++ b/libdecnumber/bid/bid-dpd.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007, 2009
-   Free Software Foundation, Inc.
+/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/bid/bid2dpd_dpd2bid.c b/libdecnumber/bid/bid2dpd_dpd2bid.c
index 7e55eb0..661de88 100644 (file)
--- a/libdecnumber/bid/bid2dpd_dpd2bid.c
+++ b/libdecnumber/bid/bid2dpd_dpd2bid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007, 2009  Free Software Foundation, Inc.
+/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/bid/bid2dpd_dpd2bid.h b/libdecnumber/bid/bid2dpd_dpd2bid.h
index b501bdc..af6c541 100644 (file)
--- a/libdecnumber/bid/bid2dpd_dpd2bid.h
+++ b/libdecnumber/bid/bid2dpd_dpd2bid.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007, 2009  Free Software Foundation, Inc.
+/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/bid/decimal128.c b/libdecnumber/bid/decimal128.c
index db30bd3..f958a53 100644 (file)
--- a/libdecnumber/bid/decimal128.c
+++ b/libdecnumber/bid/decimal128.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007, 2009
-   Free Software Foundation, Inc.
+/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/bid/decimal32.c b/libdecnumber/bid/decimal32.c
index 1cd7607..51bd49b 100644 (file)
--- a/libdecnumber/bid/decimal32.c
+++ b/libdecnumber/bid/decimal32.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007, 2009
-   Free Software Foundation, Inc.
+/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/bid/decimal64.c b/libdecnumber/bid/decimal64.c
index fd63738..56f96a8 100644 (file)
--- a/libdecnumber/bid/decimal64.c
+++ b/libdecnumber/bid/decimal64.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007, 2009
-   Free Software Foundation, Inc.
+/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/bid/host-ieee128.c b/libdecnumber/bid/host-ieee128.c
index 9e2d005..ba5092c 100644 (file)
--- a/libdecnumber/bid/host-ieee128.c
+++ b/libdecnumber/bid/host-ieee128.c
@@ -1,5 +1,5 @@
 /* This is a software decimal floating point library.
-   Copyright (C) 2007, 2009  Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/bid/host-ieee32.c b/libdecnumber/bid/host-ieee32.c
index 1de6dc2..650051e 100644 (file)
--- a/libdecnumber/bid/host-ieee32.c
+++ b/libdecnumber/bid/host-ieee32.c
@@ -1,5 +1,5 @@
 /* This is a software decimal floating point library.
-   Copyright (C) 2007, 2009  Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/bid/host-ieee64.c b/libdecnumber/bid/host-ieee64.c
index 825eb0a..ede5cd8 100644 (file)
--- a/libdecnumber/bid/host-ieee64.c
+++ b/libdecnumber/bid/host-ieee64.c
@@ -1,5 +1,5 @@
 /* This is a software decimal floating point library.
-   Copyright (C) 2007, 2009  Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 This file is part of GCC.
 

diff --git a/libdecnumber/configure.ac b/libdecnumber/configure.ac
index 87820bf..a6f7f07 100644 (file)
--- a/libdecnumber/configure.ac
+++ b/libdecnumber/configure.ac
@@ -1,7 +1,7 @@
 # configure.ac for libdecnumber                        -*- Autoconf -*-
 # Process this file with autoconf to generate a configuration script.
 
-# Copyright 2005, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
 # This file is part of GCC.
 

diff --git a/libdecnumber/dconfig.h b/libdecnumber/dconfig.h
index 975f9a1..de634b6 100644 (file)
--- a/libdecnumber/dconfig.h
+++ b/libdecnumber/dconfig.h
@@ -1,5 +1,5 @@
 /* Configure decNumber for either host or target.
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
    This file is part of GCC.
 

diff --git a/libdecnumber/decBasic.c b/libdecnumber/decBasic.c
index 75ce17b..6fbf48e 100644 (file)
--- a/libdecnumber/decBasic.c
+++ b/libdecnumber/decBasic.c
@@ -1,5 +1,5 @@
 /* Common base code for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decCommon.c b/libdecnumber/decCommon.c
index add1f2e..42b05b2 100644 (file)
--- a/libdecnumber/decCommon.c
+++ b/libdecnumber/decCommon.c
@@ -1,5 +1,5 @@
 /* Common code for fixed-size types in the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decContext.c b/libdecnumber/decContext.c
index aa81959..d0e2e28 100644 (file)
--- a/libdecnumber/decContext.c
+++ b/libdecnumber/decContext.c
@@ -1,5 +1,5 @@
 /* Decimal context module for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decContext.h b/libdecnumber/decContext.h
index ae0ca07..fed7a0e 100644 (file)
--- a/libdecnumber/decContext.h
+++ b/libdecnumber/decContext.h
@@ -1,5 +1,5 @@
 /* Decimal context header module for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decDPD.h b/libdecnumber/decDPD.h
index db4d343..83359df 100644 (file)
--- a/libdecnumber/decDPD.h
+++ b/libdecnumber/decDPD.h
@@ -1,5 +1,5 @@
 /* Conversion lookup tables for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decDouble.c b/libdecnumber/decDouble.c
index 9af8e15..b887869 100644 (file)
--- a/libdecnumber/decDouble.c
+++ b/libdecnumber/decDouble.c
@@ -1,5 +1,5 @@
 /* decDouble module for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decDouble.h b/libdecnumber/decDouble.h
index 0aaf66e..fa66480 100644 (file)
--- a/libdecnumber/decDouble.h
+++ b/libdecnumber/decDouble.h
@@ -1,5 +1,5 @@
 /* decDouble module header for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decExcept.c b/libdecnumber/decExcept.c
index 99c20db..945a7f2 100644 (file)
--- a/libdecnumber/decExcept.c
+++ b/libdecnumber/decExcept.c
@@ -1,5 +1,5 @@
 /* Temporary library support for decimal floating point.
-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
    This file is part of GCC.
 

diff --git a/libdecnumber/decExcept.h b/libdecnumber/decExcept.h
index 73eb9af..83a70c9 100644 (file)
--- a/libdecnumber/decExcept.h
+++ b/libdecnumber/decExcept.h
@@ -1,5 +1,5 @@
 /* Temporary library support for decimal floating point.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 
    This file is part of GCC.
 

diff --git a/libdecnumber/decLibrary.c b/libdecnumber/decLibrary.c
index 323a0d6..3b860de 100644 (file)
--- a/libdecnumber/decLibrary.c
+++ b/libdecnumber/decLibrary.c
@@ -1,5 +1,5 @@
 /* Temporary library support for decimal floating point.
-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
    This file is part of GCC.
 

diff --git a/libdecnumber/decNumber.c b/libdecnumber/decNumber.c
index cf2d32e..72cdbf2 100644 (file)
--- a/libdecnumber/decNumber.c
+++ b/libdecnumber/decNumber.c
@@ -1,5 +1,5 @@
 /* Decimal number arithmetic module for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decNumber.h b/libdecnumber/decNumber.h
index 05ccb9f..90087df 100644 (file)
--- a/libdecnumber/decNumber.h
+++ b/libdecnumber/decNumber.h
@@ -1,5 +1,5 @@
 /* Decimal number arithmetic module header for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decNumberLocal.h b/libdecnumber/decNumberLocal.h
index dca79e5..c8dbafc 100644 (file)
--- a/libdecnumber/decNumberLocal.h
+++ b/libdecnumber/decNumberLocal.h
@@ -1,5 +1,5 @@
 /* Local definitions for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decPacked.c b/libdecnumber/decPacked.c
index 3e77bad..193af83 100644 (file)
--- a/libdecnumber/decPacked.c
+++ b/libdecnumber/decPacked.c
@@ -1,5 +1,5 @@
 /* Packed decimal conversion module for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decPacked.h b/libdecnumber/decPacked.h
index 539653b..94b60fa 100644 (file)
--- a/libdecnumber/decPacked.h
+++ b/libdecnumber/decPacked.h
@@ -1,5 +1,5 @@
 /* Packed decimal conversion module header for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decQuad.c b/libdecnumber/decQuad.c
index dcd670b..e18e9df 100644 (file)
--- a/libdecnumber/decQuad.c
+++ b/libdecnumber/decQuad.c
@@ -1,5 +1,5 @@
 /* decQuad module for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decQuad.h b/libdecnumber/decQuad.h
index 60cc632..d05c945 100644 (file)
--- a/libdecnumber/decQuad.h
+++ b/libdecnumber/decQuad.h
@@ -1,5 +1,5 @@
 /* decQuad module header for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decRound.c b/libdecnumber/decRound.c
index 811bea8..1f40541 100644 (file)
--- a/libdecnumber/decRound.c
+++ b/libdecnumber/decRound.c
@@ -1,6 +1,6 @@
 /* Internal testing support for rounding for decimal float.
 
-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
    This file is part of GCC.
 

diff --git a/libdecnumber/decRound.h b/libdecnumber/decRound.h
index c17b6d1..44097ec 100644 (file)
--- a/libdecnumber/decRound.h
+++ b/libdecnumber/decRound.h
@@ -1,6 +1,6 @@
 /* Internal testing support for rounding for decimal float.
 
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 
    This file is part of GCC.
 

diff --git a/libdecnumber/decSingle.c b/libdecnumber/decSingle.c
index c79b7f1..cd6f12b 100644 (file)
--- a/libdecnumber/decSingle.c
+++ b/libdecnumber/decSingle.c
@@ -1,5 +1,5 @@
 /* decSingle module for the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/decSingle.h b/libdecnumber/decSingle.h
index 3904d94..05b54ae 100644 (file)
--- a/libdecnumber/decSingle.h
+++ b/libdecnumber/decSingle.h
@@ -1,5 +1,5 @@
 /* decSingle module header for the decNumber C Library.
-   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/dpd/decimal128.c b/libdecnumber/dpd/decimal128.c
index cd2db93..92af60f 100644 (file)
--- a/libdecnumber/dpd/decimal128.c
+++ b/libdecnumber/dpd/decimal128.c
@@ -1,5 +1,5 @@
 /* Decimal 128-bit format module for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/dpd/decimal128.h b/libdecnumber/dpd/decimal128.h
index 3c83c81..42da6fc 100644 (file)
--- a/libdecnumber/dpd/decimal128.h
+++ b/libdecnumber/dpd/decimal128.h
@@ -1,5 +1,5 @@
 /* Decimal 128-bit format module header for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/dpd/decimal128Local.h b/libdecnumber/dpd/decimal128Local.h
index 1963678..e27bcc5 100644 (file)
--- a/libdecnumber/dpd/decimal128Local.h
+++ b/libdecnumber/dpd/decimal128Local.h
@@ -1,5 +1,5 @@
 /* Local definitions for use with the decNumber C Library.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
    This file is part of GCC.
 

diff --git a/libdecnumber/dpd/decimal32.c b/libdecnumber/dpd/decimal32.c
index 9084ac8..6f034d0 100644 (file)
--- a/libdecnumber/dpd/decimal32.c
+++ b/libdecnumber/dpd/decimal32.c
@@ -1,5 +1,5 @@
 /* Decimal 32-bit format module for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/dpd/decimal32.h b/libdecnumber/dpd/decimal32.h
index 94ddeb8..79f95ea 100644 (file)
--- a/libdecnumber/dpd/decimal32.h
+++ b/libdecnumber/dpd/decimal32.h
@@ -1,5 +1,5 @@
 /* Decimal 32-bit format module header for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/dpd/decimal64.c b/libdecnumber/dpd/decimal64.c
index d5153a2..0815ba2 100644 (file)
--- a/libdecnumber/dpd/decimal64.c
+++ b/libdecnumber/dpd/decimal64.c
@@ -1,5 +1,5 @@
 /* Decimal 64-bit format module for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libdecnumber/dpd/decimal64.h b/libdecnumber/dpd/decimal64.h
index c501415..8a0b617 100644 (file)
--- a/libdecnumber/dpd/decimal64.h
+++ b/libdecnumber/dpd/decimal64.h
@@ -1,5 +1,5 @@
 /* Decimal 64-bit format module header for the decNumber C Library.
-   Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
    Contributed by IBM Corporation.  Author Mike Cowlishaw.
 
    This file is part of GCC.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 2a91c41..cbcd1e2 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,6 +1,10 @@
 2013-01-31  Kai Tietz  <ktietz@redhat.com>
 
-       PR other/543413
+       PR other/54620
+       * sha1.c (sha1_process_block):  Handle case that size_t is
+       a wider-integer-scalar as a 32-bit unsigned integer.
+
+       PR other/53413
        * md5.c (md5_process_block):  Handle case that size_t is
        a wider-integer-scalar a 32-bit unsigned integer.
 

diff --git a/libiberty/sha1.c b/libiberty/sha1.c
index 6a25ab2..617e743 100644 (file)
--- a/libiberty/sha1.c
+++ b/libiberty/sha1.c
@@ -300,8 +300,7 @@ sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx)
      length of the file up to 2^64 bits.  Here we only compute the
      number of bytes.  Do a double word increment.  */
   ctx->total[0] += len;
-  if (ctx->total[0] < len)
-    ++ctx->total[1];
+  ctx->total[1] += ((len >> 31) >> 1) + (ctx->total[0] < len);
 
 #define rol(x, n) (((x) << (n)) | ((sha1_uint32) (x) >> (32 - (n))))