summaryrefslogtreecommitdiff log msg author committer range
blob: be25be6162b11d46daca3945b9b3a1961f81d3be (plain)
 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 From b5c305fc251299f2e328410b18cfb55c75b5f038 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:33:04 +0400 Subject: [PATCH 26/46] Use the multilib config files from \${B} instead of using the ones from \${S} Use the multilib config files from \${B} instead of using the ones from \${S} so that the source can be shared between gcc-cross-initial, gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. Signed-off-by: Khem Raj Signed-off-by: Constantin Musca Upstream-Status: Inappropriate [configuration] --- gcc/configure | 22 ++++++++++++++++++---- gcc/configure.ac | 22 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/gcc/configure b/gcc/configure index 73c264d..377253e 100755 --- a/gcc/configure +++ b/gcc/configure @@ -12110,10 +12110,20 @@ done tmake_file_= for f in \${tmake_file} do - if test -f \${srcdir}/config/\$f - then - tmake_file_="\${tmake_file_} \\$(srcdir)/config/\$f" - fi + case \$f in + */t-linux64 ) + if test -f ./config/\$f + then + tmake_file_="\${tmake_file_} ./config/\$f" + fi + ;; + * ) + if test -f \${srcdir}/config/\$f + then + tmake_file_="\${tmake_file_} \\$(srcdir)/config/\$f" + fi + ;; + esac done tmake_file="\${tmake_file_}" @@ -12124,6 +12134,10 @@ tm_file_list="options.h" tm_include_list="options.h insn-constants.h" for f in \$tm_file; do case \$f in + */linux64.h ) + tm_file_list="\${tm_file_list} ./config/\$f" + tm_include_list="\${tm_include_list} ./config/\$f" + ;; ./* ) f=`echo \$f | sed 's/^..//'` tm_file_list="\${tm_file_list} \$f" diff --git a/gcc/configure.ac b/gcc/configure.ac index cecf121..54e7619 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1863,10 +1863,20 @@ done tmake_file_= for f in \${tmake_file} do - if test -f \${srcdir}/config/\$f - then - tmake_file_="\${tmake_file_} \\$(srcdir)/config/\$f" - fi + case \$f in + */t-linux64 ) + if test -f ./config/\$f + then + tmake_file_="\${tmake_file_} ./config/\$f" + fi + ;; + * ) + if test -f \${srcdir}/config/\$f + then + tmake_file_="\${tmake_file_} \\$(srcdir)/config/\$f" + fi + ;; + esac done tmake_file="\${tmake_file_}" @@ -1877,6 +1887,10 @@ tm_file_list="options.h" tm_include_list="options.h insn-constants.h" for f in \$tm_file; do case \$f in + */linux64.h ) + tm_file_list="\${tm_file_list} ./config/\$f" + tm_include_list="\${tm_include_list} ./config/\$f" + ;; ./* ) f=`echo \$f | sed 's/^..//'` tm_file_list="\${tm_file_list} \$f" -- 2.8.2