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  <[email protected]>
+
+        * MAINTAINERS (write after approval): Add myself.
+
 2017-10-01  Gerald Pfeifer  <[email protected]>
 
 	* MAINTAINERS: Add a note that maintainership also includes web

MAINTAINERS

@@ -603,6 +603,7 @@ Ilya Tocar					<[email protected]>
 Philipp Tomsich					<[email protected]>
 Konrad Trifunovic				<[email protected]>
 Markus Trippelsdorf				<[email protected]>
+Igor Tsimbalist					<[email protected]>
 Martin Uecker					<[email protected]>
 David Ung					<[email protected]>
 Neil Vachharajani				<[email protected]>

fixincludes/ChangeLog

@@ -1,3 +1,8 @@
+2017-10-13  Mike Frysinger  <[email protected]>
+
+	* fixinc.in (dirname): Change sed from 's|[^/]*/||' to
+	's|[^/]*//*||'.
+
 2017-06-12  Doug Rupp  <[email protected]>
 
 	* 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