0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch 2.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899
  1. From bf85b8bbcb4b77725d4c22c1bb25a29f6ff21038 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Fri, 29 Mar 2013 09:33:04 +0400
  4. Subject: [PATCH] Use the multilib config files from ${B} instead of using the
  5. ones from ${S}
  6. Use the multilib config files from ${B} instead of using the ones from ${S}
  7. so that the source can be shared between gcc-cross-initial,
  8. gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
  9. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  10. Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
  11. Upstream-Status: Inappropriate [configuration]
  12. ---
  13. gcc/configure | 22 ++++++++++++++++++----
  14. gcc/configure.ac | 22 ++++++++++++++++++----
  15. 2 files changed, 36 insertions(+), 8 deletions(-)
  16. diff --git a/gcc/configure b/gcc/configure
  17. index 3fc0e2f5813..2f0f0e057a9 100755
  18. --- a/gcc/configure
  19. +++ b/gcc/configure
  20. @@ -13361,10 +13361,20 @@ done
  21. tmake_file_=
  22. for f in ${tmake_file}
  23. do
  24. - if test -f ${srcdir}/config/$f
  25. - then
  26. - tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
  27. - fi
  28. + case $f in
  29. + */t-linux64 )
  30. + if test -f ./config/$f
  31. + then
  32. + tmake_file_="${tmake_file_} ./config/$f"
  33. + fi
  34. + ;;
  35. + * )
  36. + if test -f ${srcdir}/config/$f
  37. + then
  38. + tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
  39. + fi
  40. + ;;
  41. + esac
  42. done
  43. tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
  44. @@ -13375,6 +13385,10 @@ tm_file_list="options.h"
  45. tm_include_list="options.h insn-constants.h"
  46. for f in $tm_file; do
  47. case $f in
  48. + */linux64.h )
  49. + tm_file_list="${tm_file_list} ./config/$f"
  50. + tm_include_list="${tm_include_list} ./config/$f"
  51. + ;;
  52. ./* )
  53. f=`echo $f | sed 's/^..//'`
  54. tm_file_list="${tm_file_list} $f"
  55. diff --git a/gcc/configure.ac b/gcc/configure.ac
  56. index 46de496b256..6155b83a732 100644
  57. --- a/gcc/configure.ac
  58. +++ b/gcc/configure.ac
  59. @@ -2312,10 +2312,20 @@ done
  60. tmake_file_=
  61. for f in ${tmake_file}
  62. do
  63. - if test -f ${srcdir}/config/$f
  64. - then
  65. - tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
  66. - fi
  67. + case $f in
  68. + */t-linux64 )
  69. + if test -f ./config/$f
  70. + then
  71. + tmake_file_="${tmake_file_} ./config/$f"
  72. + fi
  73. + ;;
  74. + * )
  75. + if test -f ${srcdir}/config/$f
  76. + then
  77. + tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
  78. + fi
  79. + ;;
  80. + esac
  81. done
  82. tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
  83. @@ -2326,6 +2336,10 @@ tm_file_list="options.h"
  84. tm_include_list="options.h insn-constants.h"
  85. for f in $tm_file; do
  86. case $f in
  87. + */linux64.h )
  88. + tm_file_list="${tm_file_list} ./config/$f"
  89. + tm_include_list="${tm_include_list} ./config/$f"
  90. + ;;
  91. ./* )
  92. f=`echo $f | sed 's/^..//'`
  93. tm_file_list="${tm_file_list} $f"