PR c++/68795: fix uninitialized close_paren_loc in cp_parser_postfix_expression

[gcc.git] / gcc / genmultilib

diff --git a/gcc/genmultilib b/gcc/genmultilib
index 4dca65d68ff35361b69cd47f054e0a0e6cf77b0c..083259aa82ca085be7410faa92929eb429393f92 100644 (file)
--- a/gcc/genmultilib
+++ b/gcc/genmultilib
@@ -1,6 +1,6 @@
 #!/bin/sh 
 # Generates multilib.h.
-#   Copyright (C) 1994-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1994-2016 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -267,6 +267,7 @@ fi
 # names.
 toosdirnames=
 defaultosdirname=
+defaultosdirname2=
 if [ -n "${multiarch}" ]; then
   defaultosdirname=::${multiarch}
 fi
@@ -280,6 +281,13 @@ if [ -n "${osdirnames}" ]; then
        if [ -n "${multiarch}" ]; then
          defaultosdirname=${defaultosdirname}:${multiarch}
        fi
+       case "$defaultosdirname" in
+         ::*) ;;
+         *)
+           defaultosdirname2=${defaultosdirname}
+           defaultosdirname=
+           ;;
+       esac
        shift
        ;;
       *=*)
@@ -352,6 +360,7 @@ for set in ${options}; do
 done
 optout=`echo ${optout} | sed -e 's/^ //'`
 echo "\".${defaultosdirname} ${optout};\","
+[ -n "${defaultosdirname2}" ] && echo "\".${defaultosdirname2} ${optout};\","
 
 # This part of code convert an option combination to
 # its corresponding directory names.