Merge pull request #7 from gcc-mirror/master

Merge upstream gcc-mirror/gcc into sourceryinstitute/gcc

Author: Damian Rouson

ChangeLog

@@ -1,3 +1,7 @@
+2017-10-16  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
+
+        * MAINTAINERS (write after approval): Add myself.
+
 2017-10-01  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* MAINTAINERS: Add a note that maintainership also includes web

MAINTAINERS

@@ -603,6 +603,7 @@ Ilya Tocar					<tocarip@gmail.com>
 Philipp Tomsich					<philipp.tomsich@theobroma-systems.com>
 Konrad Trifunovic				<konrad.trifunovic@inria.fr>
 Markus Trippelsdorf				<markus@trippelsdorf.de>
+Igor Tsimbalist					<igor.v.tsimbalist@intel.com>
 Martin Uecker					<uecker@eecs.berkeley.edu>
 David Ung					<davidu@mips.com>
 Neil Vachharajani				<nvachhar@gmail.com>

fixincludes/ChangeLog

@@ -1,3 +1,8 @@
+2017-10-13  Mike Frysinger  <vapier@chromium.org>
+
+	* fixinc.in (dirname): Change sed from 's|[^/]*/||' to
+	's|[^/]*//*||'.
+
 2017-06-12  Doug Rupp  <rupp@adacore.com>
 
 	* inclhack.def (AAB_vxworks_stdint): Remove hack.

fixincludes/fixinc.in

@@ -344,7 +344,7 @@ if $LINKS; then
             mkdir $component >/dev/null 2>&1
             cd $component
             dirmade=$dirmade/$component
-            dirname=`echo $dirname | sed -e 's|[^/]*/||'`
+            dirname=`echo $dirname | sed -e 's|[^/]*//*||'`
           done
         fi