print-sysroot-suffix.sh: Handle MULTILIB_REUSE settings.

2015-06-05  Julian Brown  <julian@codesourcery.com>
	    Sandra Loosemore  <sandra@codesourcery.com>

	gcc/
	* config/print-sysroot-suffix.sh: Handle MULTILIB_REUSE settings.
	* config/t-sysroot-suffix (sysroot-suffix.h): Pass MULTILIB_REUSE
	to print-sysroot-suffix.sh script.

Co-Authored-By: Sandra Loosemore <sandra@codesourcery.com>
From-SVN: r224156

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d641111dc121356b9a7e84b49b2e79f29021beb7..cb1339a2886edaada9a43f7d1943cc5f3741c769 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-05  Julian Brown  <julian@codesourcery.com>
+           Sandra Loosemore  <sandra@codesourcery.com>
+
+       * config/print-sysroot-suffix.sh: Handle MULTILIB_REUSE settings.
+       * config/t-sysroot-suffix (sysroot-suffix.h): Pass MULTILIB_REUSE
+       to print-sysroot-suffix.sh script.
+
 2015-06-05  Tom de Vries  <tom@codesourcery.com>
 
        merge from gomp4 branch:

diff --git a/gcc/config/print-sysroot-suffix.sh b/gcc/config/print-sysroot-suffix.sh
index 4080aaf85df42fd61291c58cd48ad4def0472a74..3f8bd94d7948288f77276ee5cf94f7acb9db84af 100644 (file)
--- a/gcc/config/print-sysroot-suffix.sh
+++ b/gcc/config/print-sysroot-suffix.sh
@@ -1,6 +1,7 @@
 #! /bin/sh
 # Script to generate SYSROOT_SUFFIX_SPEC equivalent to MULTILIB_OSDIRNAMES
-# Arguments are MULTILIB_OSDIRNAMES, MULTILIB_OPTIONS and MULTILIB_MATCHES.
+# Arguments are MULTILIB_OSDIRNAMES, MULTILIB_OPTIONS, MULTILIB_MATCHES,
+# and MULTILIB_REUSE.
 
 # Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
@@ -29,10 +30,11 @@
 #          MULTILIB_OSDIRNAMES \
 #          MULTILIB_OPTIONS \
 #          MULTILIB_MATCHES \
+#          MULTILIB_REUSE
 #      > t-sysroot-suffix.h
 
-# The three options exactly correspond to the variables of the same
-# names defined in the tmake_file fragments.
+# The four options exactly correspond to the variables of the same
+# names defined in the t-sysroot-suffix tmake_file fragment.
 
 # Example:
 #   sh ./gcc/config/print-sysroot-suffix.sh "a=A" "a b/c/d" ""
@@ -54,6 +56,7 @@ set -e
 dirnames="$1"
 options="$2"
 matches="$3"
+reuse="$4"
 
 cat > print-sysroot-suffix3.sh <<\EOF
 #! /bin/sh
@@ -80,7 +83,14 @@ shift 2
 n="\" \\
 $padding\""
 if [ $# = 0 ]; then
+  case $optstring in
 EOF
+for x in $reuse; do
+  l=`echo $x | sed -e 's/=.*$//' -e 's/\./=/g'`
+  r=`echo $x | sed -e 's/^.*=//' -e 's/\./=/g'`
+  echo "/$r/) optstring=\"/$l/\" ;;" >> print-sysroot-suffix2.sh
+done
+echo "  esac" >> print-sysroot-suffix2.sh
 
 pat=
 for x in $dirnames; do

diff --git a/gcc/config/t-sysroot-suffix b/gcc/config/t-sysroot-suffix
index 08b4f949e3cbc981b7d340df094d6cbae57a7dd3..79d76e792d7693135ca82607abc8e486319c01f8 100644 (file)
--- a/gcc/config/t-sysroot-suffix
+++ b/gcc/config/t-sysroot-suffix
@@ -3,5 +3,5 @@
 sysroot-suffix.h: $(srcdir)/config/print-sysroot-suffix.sh
        $(SHELL) $(srcdir)/config/print-sysroot-suffix.sh \
          "$(MULTILIB_OSDIRNAMES)" "$(MULTILIB_OPTIONS)" \
-         "$(MULTILIB_MATCHES)" > tmp-sysroot-suffix.h
+         "$(MULTILIB_MATCHES)" "$(MULTILIB_REUSE)" > tmp-sysroot-suffix.h
        mv tmp-sysroot-suffix.h $@