Merge tag 'gcc-6-20160327' into or1k-gcc6

ChangeLog

@@ -1,3 +1,16 @@
+2016-03-17  Cary Coutant  <[email protected]>
+
+	Sync with binutils-gdb:
+
+	2016-03-17  Cary Coutant  <[email protected]>
+
+	* configure.ac: Add mips and s390 to the gold target check.
+	* configure: Regenerate.
+
+2016-03-01  DJ Delorie  <[email protected]>
+
+	* MAINTAINERS (mep): Remove myself as MeP maintainer.
+
 2016-02-22  David Malcolm  <[email protected]>
 
 	* MAINTAINERS (libcpp): Add myself.

MAINTAINERS

@@ -75,7 +75,6 @@ m68k port (?)		Jeff Law		<[email protected]>
 m68k port		Andreas Schwab		<[email protected]>
 m68k-motorola-sysv port	Philippe De Muyter	<[email protected]>
 mcore port		Nick Clifton		<[email protected]>
-mep port		DJ Delorie		<[email protected]>
 microblaze		Michael Eager		<[email protected]>
 mips port		Catherine Moore		<[email protected]>
 mips port		Eric Christopher	<[email protected]>

boehm-gc/ChangeLog

@@ -1,3 +1,8 @@
+2016-03-16  Andreas Schwab  <[email protected]>
+
+	* include/private/gcconfig.h [AARCH64] (ALIGNMENT, CPP_WORDSZ):
+	Define for __ILP32__.
+
 2015-10-09  David Malcolm  <[email protected]>
 
 	* testsuite/lib/boehm-gc.exp: Load multiline.exp before

boehm-gc/include/private/gcconfig.h

@@ -1854,9 +1854,14 @@
 # endif
 
 # ifdef AARCH64
-#   define CPP_WORDSZ 64
+#   ifdef __ILP32__
+#     define ALIGNMENT 4
+#     define CPP_WORDSZ 32
+#   else
+#     define ALIGNMENT 8
+#     define CPP_WORDSZ 64
+#   endif
 #   define MACH_TYPE "AARCH64"
-#   define ALIGNMENT 8
 #   ifndef HBLKSIZE
 #     define HBLKSIZE 4096
 #   endif

configure

@@ -2973,7 +2973,7 @@ case "${ENABLE_GOLD}" in
       # Check for target supported by gold.
       case "${target}" in
         i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-* \
-        | aarch64*-*-* | tilegx*-*-*)
+        | aarch64*-*-* | tilegx*-*-* | mips*-*-* | s390*-*-*)
 	  configdirs="$configdirs gold"
 	  if test x${ENABLE_GOLD} = xdefault; then
 	    default_ld=gold

configure.ac

@@ -351,7 +351,7 @@ case "${ENABLE_GOLD}" in
       # Check for target supported by gold.
       case "${target}" in
         i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-* \
-        | aarch64*-*-* | tilegx*-*-*)
+        | aarch64*-*-* | tilegx*-*-* | mips*-*-* | s390*-*-*)
 	  configdirs="$configdirs gold"
 	  if test x${ENABLE_GOLD} = xdefault; then
 	    default_ld=gold

contrib/ChangeLog

@@ -1,3 +1,16 @@
+2016-03-07  Martin Sebor  <[email protected]>
+
+	* check_GNU_style.sh (color): New global variable.
+	Add checks for trailing operators and spaces before left brackets.
+	Tightened up a check for a trailing left curly brace.
+	(g, ag, vg): Use color.
+	(col): Don't complain about excessively long lines with DejaGnu
+	directives.
+
+2016-03-06  Trevor Saunders  <[email protected]>
+
+	* mklog: Look for the ChangeLog file in $cwd.
+
 2016-02-26  Joel Sherrill <[email protected]>
 
 	* config-list.mk: Add aarch64-rtems and x86_64-rtems

contrib/check_GNU_style.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Checks some of the GNU style formatting rules in a set of patches.
-# Copyright (C) 2010, 2012  Free Software Foundation, Inc.
+# Copyright (C) 2010, 2012, 2016  Free Software Foundation, Inc.
 # Contributed by Sebastian Pop <[email protected]>
 
 # This program is free software; you can redistribute it and/or modify
@@ -15,8 +15,11 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program; if not, see the file COPYING3.  If not,
+# see <http://www.gnu.org/licenses/>.
+
+# Set to empty in the environment to override.
+: ${color:---color=always}
 
 usage() {
     cat <<EOF
@@ -100,7 +103,7 @@ g (){
 
     local found=false
     cat $inp \
-	| egrep --color=always -- "$arg" \
+	| egrep $color -- "$arg" \
 	> "$tmp" && found=true
 
     if $found; then
@@ -117,8 +120,8 @@ ag (){
 
     local found=false
     cat $inp \
-	| egrep --color=always -- "$arg1" \
-	| egrep --color=always -- "$arg2" \
+	| egrep $color -- "$arg1" \
+	| egrep $color -- "$arg2" \
 	> "$tmp" && found=true
 
     if $found; then
@@ -136,7 +139,7 @@ vg (){
     local found=false
     cat $inp \
 	| egrep -v -- "$varg" \
-	| egrep --color=always -- "$arg" \
+	| egrep $color -- "$arg" \
 	> "$tmp" && found=true
 
     if $found; then
@@ -171,10 +174,11 @@ col (){
 	# Expand tabs to spaces according to tab positions.
 	# Keep long lines, make short lines empty.  Print the part past 80 chars
 	# in red.
+        # Don't complain about dg-xxx directives in tests.
 	cat "$tmp" \
 	    | sed 's/^[0-9]*:+//' \
 	    | expand \
-	    | awk '{ \
+	    | awk '$0 !~ /{[[:space:]]*dg-(error|warning|message)[[:space:]]/ { \
 		     if (length($0) > 80) \
 		       printf "%s\033[1;31m%s\033[0m\n", \
 			      substr($0,1,80), \
@@ -201,6 +205,7 @@ col (){
     done
 }
 
+
 col 'Lines should not exceed 80 characters.'
 
 g 'Blocks of 8 spaces should be replaced with tabs.' \
@@ -221,13 +226,20 @@ g 'Dot, space, space, end of comment.' \
 g 'Sentences should end with a dot.  Dot, space, space, end of the comment.' \
     '[[:alnum:]][[:blank:]]*\*/'
 
-vg 'There should be exactly one space between function name and parentheses.' \
+vg 'There should be exactly one space between function name and parenthesis.' \
     '\#define' \
     '[[:alnum:]]([[:blank:]]{2,})?\('
 
-g 'There should be no space before closing parentheses.' \
+g 'There should be no space before a left square bracket.' \
+   '[[:alnum:]][[:blank:]]+\['
+
+g 'There should be no space before closing parenthesis.' \
     '[[:graph:]][[:blank:]]+\)'
 
-ag 'Braces should be on a separate line.' \
-    '\{' \
-    'if[[:blank:]]\(|while[[:blank:]]\(|switch[[:blank:]]\('
+# This will give false positives for C99 compound literals.
+g 'Braces should be on a separate line.' \
+    '(\)|else)[[:blank:]]*{'
+
+# Does this apply to definition of aggregate objects?
+g 'Trailing operator.' \
+  '(([^a-zA-Z_]\*)|([-%<=&|^?])|([^*]/)|([^:][+]))$'

contrib/mklog

@@ -104,7 +104,7 @@ sub get_clname ($) {
 	my $dirname = $_[0];
 	while ($dirname) {
 		my $clname = "$dirname/ChangeLog";
-		if (-f "$gcc_root/$clname") {
+		if (-f "$gcc_root/$clname" || -f "$clname") {
 			my $relname = substr ($_[0], length ($dirname) + 1);
 			return ($clname, $relname);
 		} else {