gcc-linaro: use snapshot of 13.02

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

3 files changed, 46 insertions, 450 deletions

diff --git a/recipes-devtools/gcc/gcc-linaro-4.6.inc b/recipes-devtools/gcc/gcc-linaro-4.6.inc
index b10e7c8e..9368b7ee 100644
--- a/recipes-devtools/gcc/gcc-linaro-4.6.inc
+++ b/recipes-devtools/gcc/gcc-linaro-4.6.inc
@@ -2,20 +2,22 @@ require recipes-devtools/gcc/gcc-4.6.inc
 require gcc-linaro-common-4.6.inc
 
 PR = "r5"
-RELEASE = "2013.01"
+RELEASE = "2013.02"
 BINV = "4.6.4"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-${PV}' ], d)}"
 
-SRC_URI = "https://launchpad.net/gcc-linaro/4.6/4.6-${RELEASE}/+download/gcc-${PV}-${RELEASE}.tar.bz2 \
+#SRC_URI = "https://launchpad.net/gcc-linaro/4.6/4.6-${RELEASE}/+download/gcc-${PV}-${RELEASE}.tar.bz2 
+
+SRC_URI = "http://cbuild.validation.linaro.org/snapshots/gcc-${PV}-${RELEASE}.tar.bz2 \
 	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
 	   file://64bithack.patch \
 	   file://optional_libstdc.patch \
 	   file://use-defaults.h-and-t-oe-in-B.patch \
 	  "
 
-SRC_URI[md5sum] = "8ab7868a9abc5693cabc936e7965e669"
-SRC_URI[sha256sum] = "55d943f3d08a11feee29fd885a14ede863aff205657bdb9d7dd36482b80a2f77"
+SRC_URI[md5sum] = "f9331b2efdf10701c6de585863f5d40d"
+SRC_URI[sha256sum] = "d1a32d7e4c1ebee73b6c3fc69504239da6b2c903c3976a027cc8cd1c15e76b60"
 
 S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}-${RELEASE}"
 B = "${WORKDIR}/gcc-${PV}-${RELEASE}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes-devtools/gcc/gcc-linaro-4.7.inc b/recipes-devtools/gcc/gcc-linaro-4.7.inc
index bcb2f872..d20426f0 100644
--- a/recipes-devtools/gcc/gcc-linaro-4.7.inc
+++ b/recipes-devtools/gcc/gcc-linaro-4.7.inc
@@ -2,10 +2,12 @@ require recipes-devtools/gcc/gcc-4.7.inc
 require gcc-linaro-common-4.7.inc
 
 PR = "r9"
-RELEASE = "2013.01"
+RELEASE = "2013.02"
 BINV = "4.7.3"
 
-SRC_URI = "https://launchpad.net/gcc-linaro/4.7/4.7-${RELEASE}/+download/gcc-${PV}-${RELEASE}.tar.bz2 \
+#SRC_URI = "https://launchpad.net/gcc-linaro/4.7/4.7-${RELEASE}/+download/gcc-${PV}-${RELEASE}.tar.bz2 
+
+SRC_URI = "http://cbuild.validation.linaro.org/snapshots/gcc-${PV}-${RELEASE}.tar.bz2 \
 	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
 	   file://64bithack.patch \
 	   file://optional_libstdc.patch \
@@ -13,8 +15,8 @@ SRC_URI = "https://launchpad.net/gcc-linaro/4.7/4.7-${RELEASE}/+download/gcc-${P
 	   file://fix-g++-sysroot.patch \
 	  "
 
-SRC_URI[md5sum] = "823516979de64df3ab6351c5ad3a9773"
-SRC_URI[sha256sum] = "63793c9a616a039ee17d0bae685fd0f8ed4137d3b743ae5dcf73cde8fc063fd7"
+SRC_URI[md5sum] = "6bdbed74c49c278ec4e87ddeca03e87f"
+SRC_URI[sha256sum] = "42f0e78d3a9fbb4c7c070b9d39614af6a8521f968891f3d0a7889ee28450a405"
 
 S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}-${RELEASE}"
 B = "${WORKDIR}/gcc-${PV}-${RELEASE}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes-devtools/gcc/gcc-linaro-4.7/fix-g++-sysroot.patch b/recipes-devtools/gcc/gcc-linaro-4.7/fix-g++-sysroot.patch
index 19fc7e52..e6028d55 100644
--- a/recipes-devtools/gcc/gcc-linaro-4.7/fix-g++-sysroot.patch
+++ b/recipes-devtools/gcc/gcc-linaro-4.7/fix-g++-sysroot.patch
@@ -8,192 +8,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Refreshed for meta-linaro by Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
 
 ---
- gcc/configure    |  182 ++++++++++++++++++++++++++++---------------------------
- gcc/configure.ac |  132 ++++++++++++++++++++-------------------
- 2 files changed, 163 insertions(+), 151 deletions(-)
+ gcc/configure    |    8 +++++++-
+ gcc/configure.ac |    8 +++++++-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
 
---- gcc-linaro-4.7-2012.06.orig/gcc/configure
-+++ gcc-linaro-4.7-2012.06/gcc/configure
-@@ -755,14 +755,10 @@ AWK
- SET_MAKE
- REPORT_BUGS_TEXI
- REPORT_BUGS_TO
- PKGVERSION
- CONFIGURE_SPECS
--CROSS_SYSTEM_HEADER_DIR
--TARGET_SYSTEM_ROOT_DEFINE
--TARGET_SYSTEM_ROOT
--SYSROOT_CFLAGS_FOR_TARGET
- enable_shared
- enable_fixed_point
- enable_decimal_float
- enable_multilib
- ENABLE_BUILD_WITH_CXX
-@@ -796,10 +792,14 @@ ac_ct_CC
- CPPFLAGS
- LDFLAGS
- CFLAGS
- CC
- GENINSRC
-+CROSS_SYSTEM_HEADER_DIR
-+TARGET_SYSTEM_ROOT_DEFINE
-+TARGET_SYSTEM_ROOT
-+SYSROOT_CFLAGS_FOR_TARGET
- target_subdir
- host_subdir
- build_subdir
- build_libsubdir
- target_noncanonical
-@@ -857,10 +857,13 @@ ac_subst_files='option_includes
- language_hooks'
- ac_user_opts='
- enable_option_checking
- with_build_libsubdir
- with_local_prefix
-+with_native_system_header_dir
-+with_build_sysroot
-+with_sysroot
- with_gxx_include_dir
- with_cpp_install_dir
- enable_generated_files_in_srcdir
- with_gnu_ld
- with_ld
-@@ -881,13 +884,10 @@ enable_fixed_point
- enable_threads
- enable_tls
- enable_objc_gc
- with_dwarf2
- enable_shared
--with_native_system_header_dir
--with_build_sysroot
--with_sysroot
- with_specs
- with_pkgversion
- with_bugurl
- enable_languages
- with_multilib_list
-@@ -1634,10 +1634,16 @@ Optional Features:
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-   --with-build-libsubdir=DIR  Directory where to find libraries for build system
-   --with-local-prefix=DIR specifies directory to put local include
-+  --with-native-system-header-dir=dir
-+                          use dir as the directory to look for standard
-+                          system header files in.  Defaults to /usr/include.
-+  --with-build-sysroot=sysroot
-+                          use sysroot as the system root during the build
-+  --with-sysroot[=DIR]    search for usr/lib, usr/include, et al, within DIR
-   --with-gxx-include-dir=DIR
-                           specifies directory to put g++ header files
-   --with-cpp-install-dir=DIR
-                           install the user visible C preprocessor in DIR
-                           (relative to PREFIX) as well as PREFIX/bin
-@@ -1646,16 +1652,10 @@ Optional Packages:
-   --with-demangler-in-ld  try to use demangler in GNU ld
-   --with-gnu-as           arrange to work with GNU as
-   --with-as               arrange to use the specified as (full pathname)
-   --with-stabs            arrange to use stabs instead of host debug format
-   --with-dwarf2           force the default debug format to be DWARF 2
--  --with-native-system-header-dir=dir
--                          use dir as the directory to look for standard
--                          system header files in.  Defaults to /usr/include.
--  --with-build-sysroot=sysroot
--                          use sysroot as the system root during the build
--  --with-sysroot[=DIR]    search for usr/lib, usr/include, et al, within DIR
-   --with-specs=SPECS      add SPECS to driver command-line processing
-   --with-pkgversion=PKG   Use PKG in the version string in place of "Linaro
-                           GCC `cat $srcdir/LINARO-VERSION`"
-   --with-bugurl=URL       Direct users to URL to report a bug
-   --with-multilib-list    select multilibs (SH and x86-64 only)
-@@ -3284,10 +3284,86 @@ fi
- # Default local prefix if it is empty
- if test x$local_prefix = x; then
- 	local_prefix=/usr/local
- fi
- 
-+
-+# Check whether --with-native-system-header-dir was given.
-+if test "${with_native_system_header_dir+set}" = set; then :
-+  withval=$with_native_system_header_dir;
-+ case ${with_native_system_header_dir} in
-+ yes|no) as_fn_error "bad value ${withval} given for --with-native-system-header-dir" "$LINENO" 5 ;;
-+ /* | [A-Za-z]:[\\/]*) ;;
-+ *) as_fn_error "--with-native-system-header-dir argument ${withval} must be an absolute directory" "$LINENO" 5 ;;
-+ esac
-+ configured_native_system_header_dir="${withval}"
-+
-+else
-+  configured_native_system_header_dir=
-+fi
-+
-+
-+
-+# Check whether --with-build-sysroot was given.
-+if test "${with_build_sysroot+set}" = set; then :
-+  withval=$with_build_sysroot; if test x"$withval" != x ; then
-+     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
-+   fi
-+else
-+  SYSROOT_CFLAGS_FOR_TARGET=
-+fi
-+
-+
-+
-+
-+# Check whether --with-sysroot was given.
-+if test "${with_sysroot+set}" = set; then :
-+  withval=$with_sysroot;
-+ case ${with_sysroot} in
-+ /) ;;
-+ */) with_sysroot=`echo $with_sysroot | sed 's,/$,,'` ;;
-+ esac
-+ case ${with_sysroot} in
-+ yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;;
-+ *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
-+ esac
-+
-+ TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
-+ CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)'
-+
-+ if test "x$prefix" = xNONE; then
-+  test_prefix=/usr/local
-+ else
-+  test_prefix=$prefix
-+ fi
-+ if test "x$exec_prefix" = xNONE; then
-+  test_exec_prefix=$test_prefix
-+ else
-+  test_exec_prefix=$exec_prefix
-+ fi
-+ case ${TARGET_SYSTEM_ROOT} in
-+ "${test_prefix}"|"${test_prefix}/"*|\
-+ "${test_exec_prefix}"|"${test_exec_prefix}/"*|\
-+ '${prefix}'|'${prefix}/'*|\
-+ '${exec_prefix}'|'${exec_prefix}/'*)
-+   t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE"
-+   TARGET_SYSTEM_ROOT_DEFINE="$t"
-+   ;;
-+ esac
-+
-+else
-+
-+ TARGET_SYSTEM_ROOT=
-+ TARGET_SYSTEM_ROOT_DEFINE=
-+ CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include'
-+
-+fi
-+
-+
-+
-+
-+
- # Don't set gcc_gxx_include_dir to gxx_include_dir since that's only
- # passed in by the toplevel make and thus we'd get different behavior
- # depending on where we built the sources.
- gcc_gxx_include_dir=
- # Specify the g++ header file directory
-@@ -3317,11 +3393,13 @@ fi
+--- gcc-linaro-4.7-2013.02.orig/gcc/configure
++++ gcc-linaro-4.7-2013.02/gcc/configure
+@@ -3322,11 +3322,13 @@ fi
  
  gcc_gxx_include_dir_add_sysroot=0
  if test "${with_sysroot+set}" = set; then
@@ -208,195 +29,24 @@ Refreshed for meta-linaro by Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
  fi
  
  
-@@ -7216,82 +7294,10 @@ else
- fi
- 
- 
- 
+@@ -7284,10 +7286,14 @@ fi
  
--# Check whether --with-native-system-header-dir was given.
--if test "${with_native_system_header_dir+set}" = set; then :
--  withval=$with_native_system_header_dir;
-- case ${with_native_system_header_dir} in
-- yes|no) as_fn_error "bad value ${withval} given for --with-native-system-header-dir" "$LINENO" 5 ;;
-- /* | [A-Za-z]:[\\/]*) ;;
-- *) as_fn_error "--with-native-system-header-dir argument ${withval} must be an absolute directory" "$LINENO" 5 ;;
-- esac
-- configured_native_system_header_dir="${withval}"
--
--else
--  configured_native_system_header_dir=
--fi
--
--
--
--# Check whether --with-build-sysroot was given.
--if test "${with_build_sysroot+set}" = set; then :
--  withval=$with_build_sysroot; if test x"$withval" != x ; then
--     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
--   fi
--else
--  SYSROOT_CFLAGS_FOR_TARGET=
--fi
--
--
--
--
--# Check whether --with-sysroot was given.
--if test "${with_sysroot+set}" = set; then :
--  withval=$with_sysroot;
-- case ${with_sysroot} in
-- yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;;
-- *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
-- esac
--
-- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
-- CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)'
--
-- if test "x$prefix" = xNONE; then
--  test_prefix=/usr/local
-- else
--  test_prefix=$prefix
-- fi
-- if test "x$exec_prefix" = xNONE; then
--  test_exec_prefix=$test_prefix
-- else
--  test_exec_prefix=$exec_prefix
-- fi
-- case ${TARGET_SYSTEM_ROOT} in
-- "${test_prefix}"|"${test_prefix}/"*|\
-- "${test_exec_prefix}"|"${test_exec_prefix}/"*|\
-- '${prefix}'|'${prefix}/'*|\
-- '${exec_prefix}'|'${exec_prefix}/'*)
--   t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE"
--   TARGET_SYSTEM_ROOT_DEFINE="$t"
--   ;;
-- esac
--
--else
--
-- TARGET_SYSTEM_ROOT=
-- TARGET_SYSTEM_ROOT_DEFINE=
-- CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include'
--
--fi
--
--
--
--
--
--
- # Check whether --with-specs was given.
- if test "${with_specs+set}" = set; then :
-   withval=$with_specs; CONFIGURE_SPECS=$withval
- else
-   CONFIGURE_SPECS=
-@@ -17969,11 +17975,11 @@ else
-   lt_cv_dlopen_self=cross
- else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17974 "configure"
-+#line 17980 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
- #include <dlfcn.h>
- #endif
-@@ -18075,11 +18081,11 @@ else
-   lt_cv_dlopen_self_static=cross
- else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 18080 "configure"
-+#line 18086 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
- #include <dlfcn.h>
- #endif
---- gcc-linaro-4.7-2012.06.orig/gcc/configure.ac
-+++ gcc-linaro-4.7-2012.06/gcc/configure.ac
-@@ -116,10 +116,76 @@ esac])
- # Default local prefix if it is empty
- if test x$local_prefix = x; then
- 	local_prefix=/usr/local
- fi
- 
-+AC_ARG_WITH([native-system-header-dir],
-+  [  --with-native-system-header-dir=dir
-+                          use dir as the directory to look for standard
-+                          system header files in.  Defaults to /usr/include.],
-+[
-+ case ${with_native_system_header_dir} in
-+ yes|no) AC_MSG_ERROR([bad value ${withval} given for --with-native-system-header-dir]) ;;
-+ /* | [[A-Za-z]]:[[\\/]]*) ;;
-+ *) AC_MSG_ERROR([--with-native-system-header-dir argument ${withval} must be an absolute directory]) ;;
-+ esac
-+ configured_native_system_header_dir="${withval}"
-+], [configured_native_system_header_dir=])
-+
-+AC_ARG_WITH(build-sysroot,
-+  [AS_HELP_STRING([--with-build-sysroot=sysroot],
-+                  [use sysroot as the system root during the build])],
-+  [if test x"$withval" != x ; then
-+     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
-+   fi],
-+  [SYSROOT_CFLAGS_FOR_TARGET=])
-+AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
-+
-+AC_ARG_WITH(sysroot,
-+[AS_HELP_STRING([[--with-sysroot[=DIR]]],
-+ [search for usr/lib, usr/include, et al, within DIR])],
-+[
-+ case ${with_sysroot} in
+ # Check whether --with-sysroot was given.
+ if test "${with_sysroot+set}" = set; then :
+   withval=$with_sysroot;
+  case ${with_sysroot} in
 + /) ;;
 + */) with_sysroot=`echo $with_sysroot | sed 's,/$,,'` ;;
 + esac
 + case ${with_sysroot} in
-+ yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;;
-+ *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
-+ esac
-+
-+ TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
-+ CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)'
-+
-+ if test "x$prefix" = xNONE; then
-+  test_prefix=/usr/local
-+ else
-+  test_prefix=$prefix
-+ fi
-+ if test "x$exec_prefix" = xNONE; then
-+  test_exec_prefix=$test_prefix
-+ else
-+  test_exec_prefix=$exec_prefix
-+ fi
-+ case ${TARGET_SYSTEM_ROOT} in
-+ "${test_prefix}"|"${test_prefix}/"*|\
-+ "${test_exec_prefix}"|"${test_exec_prefix}/"*|\
-+ '${prefix}'|'${prefix}/'*|\
-+ '${exec_prefix}'|'${exec_prefix}/'*)
-+   t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE"
-+   TARGET_SYSTEM_ROOT_DEFINE="$t"
-+   ;;
-+ esac
-+], [
-+ TARGET_SYSTEM_ROOT=
-+ TARGET_SYSTEM_ROOT_DEFINE=
-+ CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include'
-+])
-+AC_SUBST(TARGET_SYSTEM_ROOT)
-+AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
-+AC_SUBST(CROSS_SYSTEM_HEADER_DIR)
-+
- # Don't set gcc_gxx_include_dir to gxx_include_dir since that's only
- # passed in by the toplevel make and thus we'd get different behavior
- # depending on where we built the sources.
- gcc_gxx_include_dir=
- # Specify the g++ header file directory
-@@ -147,11 +213,13 @@ fi
+  yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;;
+  *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
+  esac
+ 
+  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
+--- gcc-linaro-4.7-2013.02.orig/gcc/configure.ac
++++ gcc-linaro-4.7-2013.02/gcc/configure.ac
+@@ -147,11 +147,13 @@ fi
  
  gcc_gxx_include_dir_add_sysroot=0
  if test "${with_sysroot+set}" = set; then
@@ -411,76 +61,18 @@ Refreshed for meta-linaro by Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
  fi
  
  AC_ARG_WITH(cpp_install_dir,
-@@ -731,72 +799,10 @@ AC_ARG_ENABLE(shared,
-     ;;
-   esac
- ], [enable_shared=yes])
- AC_SUBST(enable_shared)
- 
--AC_ARG_WITH([native-system-header-dir],
--  [  --with-native-system-header-dir=dir
--                          use dir as the directory to look for standard
--                          system header files in.  Defaults to /usr/include.],
--[
-- case ${with_native_system_header_dir} in
-- yes|no) AC_MSG_ERROR([bad value ${withval} given for --with-native-system-header-dir]) ;;
-- /* | [[A-Za-z]]:[[\\/]]*) ;;
-- *) AC_MSG_ERROR([--with-native-system-header-dir argument ${withval} must be an absolute directory]) ;;
-- esac
-- configured_native_system_header_dir="${withval}"
--], [configured_native_system_header_dir=])
--
--AC_ARG_WITH(build-sysroot, 
--  [AS_HELP_STRING([--with-build-sysroot=sysroot],
--                  [use sysroot as the system root during the build])],
--  [if test x"$withval" != x ; then
--     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
--   fi],
--  [SYSROOT_CFLAGS_FOR_TARGET=])
--AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
--
--AC_ARG_WITH(sysroot,
--[AS_HELP_STRING([[--with-sysroot[=DIR]]],
--		[search for usr/lib, usr/include, et al, within DIR])],
--[
-- case ${with_sysroot} in
-- yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;;
-- *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
-- esac
--   
-- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
-- CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)'
--	
-- if test "x$prefix" = xNONE; then
--  test_prefix=/usr/local
-- else
--  test_prefix=$prefix
-- fi
-- if test "x$exec_prefix" = xNONE; then
--  test_exec_prefix=$test_prefix
-- else
--  test_exec_prefix=$exec_prefix
-- fi
-- case ${TARGET_SYSTEM_ROOT} in
-- "${test_prefix}"|"${test_prefix}/"*|\
-- "${test_exec_prefix}"|"${test_exec_prefix}/"*|\
-- '${prefix}'|'${prefix}/'*|\
-- '${exec_prefix}'|'${exec_prefix}/'*)
--   t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE"
--   TARGET_SYSTEM_ROOT_DEFINE="$t"
--   ;;
-- esac
--], [
-- TARGET_SYSTEM_ROOT=
-- TARGET_SYSTEM_ROOT_DEFINE=
-- CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include'
--])
--AC_SUBST(TARGET_SYSTEM_ROOT)
--AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
--AC_SUBST(CROSS_SYSTEM_HEADER_DIR)
--
- AC_ARG_WITH(specs,
-   [AS_HELP_STRING([--with-specs=SPECS],
-                   [add SPECS to driver command-line processing])],
-   [CONFIGURE_SPECS=$withval],
-   [CONFIGURE_SPECS=]
+@@ -784,10 +786,14 @@ AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
+ AC_ARG_WITH(sysroot,
+ [AS_HELP_STRING([[--with-sysroot[=DIR]]],
+ 		[search for usr/lib, usr/include, et al, within DIR])],
+ [
+  case ${with_sysroot} in
++ /) ;;
++ */) with_sysroot=`echo $with_sysroot | sed 's,/$,,'` ;;
++ esac
++ case ${with_sysroot} in
+  yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;;
+  *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
+  esac
+    
+  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'