162 files changed, 354 insertions, 341 deletions

diff --git a/.gitreview b/.gitreview
index dd90223b..c4aac1b9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.linaro.org
 port=29418
-project=toolchain/cbuild2
+project=toolchain/abe
diff --git a/README b/README
index 53afb4d2..c070c373 100644
--- a/README
+++ b/README
@@ -1,19 +1,19 @@
                         README
 
-Cbuildv2 is a bourne shell rewrite of the existing cbuild system as
+Abe is a bourne shell rewrite of the existing Cbuildv1 system as
 used by Linaro. While being oriented to the Linaro way of doing
-things, Cbuildv2 should be usable by others by just reconfiguring.
+things, Abe should be usable by others by just reconfiguring.
 
-Configuring Cbuildv2:
+Configuring Abe:
 ---------------------
-  While it is possible to run Cbuildv2 from it's source tree, this
+  While it is possible to run Abe from it's source tree, this
 isn't recommended. The best practice is to create a new build
-directory, and configure Cbuildv2 in that directory. That makes it
+directory, and configure Abe in that directory. That makes it
 easy to change branches, or even delete subdirectories. There
 are defaults for all paths, which is to create them under the same
 directory configure is run in.
 
-  There are several directories that Cbuildv2 needs. These are the
+  There are several directories that Abe needs. These are the
 following:
 
   * local snapshots - This is where all the downloaded sources get
@@ -23,17 +23,17 @@ following:
     full hostname of the build machine. Under this a directory is
     created for the target architecture.
   * remote snapshots - This is where remote tarballs are stored. This
-    currently defaults to cbuild.validation.linaro.org, which is
+    currently defaults to abe.validation.linaro.org, which is
     accessible via HTTP to the general public.
 
   If configure is executed without any parameters. the defaults are
 used. It is also possible to change those values at configure
 time. For example:
 
-$CBUILD-PATH/configure
---with-local-snapshots=$CBUILD_PATH/snapshots 
---with-local-builds=$CBUILD-PATH/destdir
---with-remote-snapshots=cbuild@toolchain64:/home/cbuild/var/snapshots/
+$ABE-PATH/configure
+--with-local-snapshots=$ABE_PATH/snapshots 
+--with-local-builds=$ABE-PATH/destdir
+--with-remote-snapshots=abe@toolchain64.lab:/home/abe/var/snapshots/
 
   This changes the 3 primary paths, including changing the remote host
 to use rsync or ssh to download tarballs instead of HTTP. You can
@@ -41,8 +41,8 @@ execute ./configure --help to get the full list of configure time
 parameters.
 
   The configure process produces a host.conf file, with the default
-settings. This file is read by cbuildv2 at runtime, so it's possible to
-change the values and rerun cbuild2.sh to use the new values. Each
+settings. This file is read by abe at runtime, so it's possible to
+change the values and rerun abe.sh to use the new values. Each
 toolchain component also has a config file. The default version is
 copied at build time to the build tree. It is also possible to edit
 this file, usually called something like gcc.conf, to change the
@@ -96,28 +96,28 @@ host, and contains the other packages needed to build GCC, like
 gmp. Snapshots is the primary location of all source tarballs. To list
 all the available snapshots, you can do this"
 
-    "cbuild2.sh --list snapshots".
+    "abe.sh --list snapshots".
 
-You can also run cbuildv2 with the --interactive options, which will
+You can also run abe with the --interactive options, which will
 display a subset of all the packages that matches the supplied
 string. To build a specific component, use the --build option to
-cbuildv2. the --target option is also used for cross builds. For
+abe. the --target option is also used for cross builds. For
 example:
 
-"cbuild2.sh --target arm-none-linux-gnueabihf gcc-linaro-4.8.2013.07-1"
+"abe.sh --target arm-none-linux-gnueabihf gcc-linaro-4.8.2013.07-1"
 
 This would fetch the source tarball for this release, build anything
 it needs to compile, the binutils for example, and then build these
 sources. You can also specify a URL to a source repository
 instead. For example:
 
-"cbuild2.sh --target arm-none-linux-gnueabihf git://git.linaro.org/toolchain/eglibc.git"
+"abe.sh --target arm-none-linux-gnueabihf git://git.linaro.org/toolchain/eglibc.git"
 
 To build an entire cross toolchain, the simplest way is to let
-cbuildv2 control all the steps. Although it is also possible to do each
+abe control all the steps. Although it is also possible to do each
 step separately. To build the full toolchain, do this:
 
-"cbuild2.sh --target arm-none-linux-gnueabihf --build all"
+"abe.sh --target arm-none-linux-gnueabihf --build all"
 
 ---------------------------------------------------------------------
 Older NOTES
@@ -161,7 +161,7 @@ Features:
  * Queue jobs for LAVA
  * Lists possible versions and components for build
 
-cbuild2 command line arguments:
+abe command line arguments:
 -------------------------------
  * --build (architecture for the build machine, default native)
  * --target (architecture for the target machine, default native)
diff --git a/cbuild2.sh b/abe.sh
index 42fd0cbd..6d98c24a 100755
--- a/cbuild2.sh
+++ b/abe.sh
@@ -20,7 +20,7 @@ usage()
 {
     # Format this section with 75 columns.
     cat << EOF
-  ${cbuild2} [''| [--timeout <value>]
+  ${abe} [''| [--timeout <value>]
              [[--build [<package> --stage {1|2}]|all]
               |[--checkout <package>|all]]
              [--ccache] [--check] [--enable {bootstrap|gerrit}]
@@ -46,7 +46,7 @@ help()
     cat << EOF
 NAME
 
-  ${cbuild2} - the Linaro Toolchain Build Framework.
+  ${abe} - the Linaro Toolchain Build Framework.
 
 SYNOPSIS
 
@@ -65,14 +65,14 @@ KEY
 
 DESCRIPTION
 
-  ${cbuild2} is a toolchain build framework. The primary purpose of
-  ${cbuild2} is to unify the method used to build cross, native, and
+  ${abe} is a toolchain build framework. The primary purpose of
+  ${abe} is to unify the method used to build cross, native, and
   Canadian-cross GNU toolchains.
 
 PRECONDITIONS
 
   Autoconf (configure) must be run in order to construct the build
-  directory and host.conf file before it is valid to run ${cbuild2}.
+  directory and host.conf file before it is valid to run ${abe}.
 
 OPTIONS
 
@@ -133,7 +133,7 @@ OPTIONS
                         This is a debugging aid for developers, as it
                         assumes everything built correctly...
                         
-  --dryrun	Run as much of ${cbuild2} as possible without doing any
+  --dryrun	Run as much of ${abe} as possible without doing any
 		actual configuration, building, or installing.
 
   --dump	Dump configuration file information for this build.
@@ -239,7 +239,7 @@ OPTIONS
 
 		''
 			Build the toolchain native to the hardware that
-			${cbuild2} is running on.
+			${abe} is running on.
                  
 		<target_triple>
 
@@ -253,7 +253,7 @@ OPTIONS
 			aarch64_be-none-linux-gnu
 
 			If <target_triple> is not the same as the hardware
-			that ${cbuild2} is running on then build the
+			that ${abe} is running on then build the
 			toolchain as a cross toolchain.
 
   --timeout <timeout_value>
@@ -288,23 +288,23 @@ EXAMPLES
 
   Build a Linux cross toolchain:
 
-    ${cbuild2} --target arm-none-linux-gnueabihf --build all
+    ${abe} --target arm-none-linux-gnueabihf --build all
 
   Build a Linux cross toolchain with glibc as the clibrary:
 
-    ${cbuild2} --target arm-none-linux-gnueabihf --set libc=glibc --build all
+    ${abe} --target arm-none-linux-gnueabihf --set libc=glibc --build all
 
   Build a bare metal toolchain:
 
-    ${cbuild2} --target aarch64-none-elf --build all
+    ${abe} --target aarch64-none-elf --build all
 
 PRECONDITION FILES
 
-  ~/.cbuildrc		${cbuild2} user specific configuration file
+  ~/.aberc		${abe} user specific configuration file
 
   host.conf		Generated by configure from host.conf.in.
 
-CBUILD GENERATED FILES AND DIRECTORIES
+ABE GENERATED FILES AND DIRECTORIES
 
   builds/		All builds are stored here.
 
@@ -327,7 +327,7 @@ EOF
 if test $# -lt 1; then
     echo "Usage:"
     usage
-    echo "Run \"${cbuild2} --help\" for detailed usage information."
+    echo "Run \"${abe} --help\" for detailed usage information."
     exit 1
 fi
 
@@ -345,9 +345,9 @@ else
 fi
 
 # load commonly used functions
-cbuild="`which $0`"
-topdir="${cbuild_path}"
-cbuild2="`basename $0`"
+abe="`which $0`"
+topdir="${abe_path}"
+abe="`basename $0`"
 
 . "${topdir}/lib/common.sh" || exit 1
 
@@ -495,7 +495,7 @@ check_directive()
 	error "--${long} requires a directive.  See --usage for details.' "
 	build_failure
     elif test `echo ${directive} | egrep -c "^\-+"` -gt 0; then
-	error "--${long} requires a directive.  ${cbuild2} found the next -- switch.  See --usage for details.' "
+	error "--${long} requires a directive.  ${abe} found the next -- switch.  See --usage for details.' "
     else
 	return 0
     fi
@@ -511,7 +511,7 @@ get_list()
 {
     echo "Get version list for $1..."
 
-    # http://cbuild.validation.linaro.org/snapshots
+    # http://abe.validation.linaro.org/snapshots
     case $1 in
 	testcode|t*)
 	    testcode="`grep testcode ${local_snapshots}/testcode/md5sums | cut -d ' ' -f 3 | cut -d '/' -f 2`"
@@ -860,7 +860,7 @@ while test $# -gt 0; do
 	--usage)
 	    echo "Usage:"
 	    usage
-	    echo "Run \"${cbuild2} --help\" for detailed usage information."
+	    echo "Run \"${abe} --help\" for detailed usage information."
 	    exit 0
 	    ;;
 	*)
@@ -974,6 +974,7 @@ fi
 
 if test ! -z ${do_build}; then
     if test x"${do_build}" != x"all"; then
+	buildingall=no
 	gitinfo="`get_source ${do_build}`"
 	if test x"${gitinfo}" = x; then
 	    error "Couldn't find the source for ${do_build}"
diff --git a/bench/host2sql.sh b/bench/host2sql.sh
index 1aa7b484..d23ecd0d 100755
--- a/bench/host2sql.sh
+++ b/bench/host2sql.sh
@@ -27,11 +27,11 @@ fi
 build_machine="`basename ${hostdir}| sed -e 's:^.*-::'`"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 # Get an index number, which is just one more than the total number of testruns
diff --git a/bench/make-benchdata.sh b/bench/make-benchdata.sh
index 23742d04..fc4bca5b 100755
--- a/bench/make-benchdata.sh
+++ b/bench/make-benchdata.sh
@@ -11,11 +11,11 @@ passwd="PASSWD"
 tmpdir="/tmp"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 # Create the output file
diff --git a/bench/make-datafiles.sh b/bench/make-datafiles.sh
index 87422e9b..efee1696 100644
--- a/bench/make-datafiles.sh
+++ b/bench/make-datafiles.sh
@@ -16,11 +16,11 @@ tmpdir="/tmp"
 outfile="benchrun.data"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 # Create the output file
diff --git a/bench/run2sql.sh b/bench/run2sql.sh
index bec4e592..59c9c9a4 100755
--- a/bench/run2sql.sh
+++ b/bench/run2sql.sh
@@ -24,11 +24,11 @@ benchrun=0
 tmpdir="/tmp"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 if test x"${benchrun}" = x; then
diff --git a/bench/tab2sql.sh b/bench/tab2sql.sh
index 5c051f31..250c11e0 100755
--- a/bench/tab2sql.sh
+++ b/bench/tab2sql.sh
@@ -26,11 +26,11 @@ tmpdir="/tmp"
 outfile="${tmpdir}/bench.tmp"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 # The benchmark.txt files are just test files with fields delimited by a
diff --git a/config/boards/README b/config/boards/README
index c444f5c7..29759eee 100644
--- a/config/boards/README
+++ b/config/boards/README
@@ -1,6 +1,6 @@
 These are the config files DejaGnu uses to access the Linaro build
 farm. When the DEJAGNU environment variables is set to
-cbuild2/config/linaro.exp, then cbuild2/config/boards is prefixed to
+abe/config/linaro.exp, then abe/config/boards is prefixed to
 the directory lookup paths. The top level sub directory is the shorter
 nodename of the system's hostname, for example tcwgbuild01.
 
diff --git a/config/boards/apm.exp b/config/boards/apm.exp
new file mode 100644
index 00000000..bd2b0a51
--- /dev/null
+++ b/config/boards/apm.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname apm-01
diff --git a/config/boards/arm-qemu.exp b/config/boards/arm-qemu.exp
index 25d49906..bf51860b 100644
--- a/config/boards/arm-qemu.exp
+++ b/config/boards/arm-qemu.exp
@@ -50,6 +50,9 @@ if { [lindex $ret 0] == 0 } {
 }
 set specdir "$sysroot/usr/lib"
 
+# set library path environment variable for qemu
+set env(QEMU_LD_PREFIX) $sysroot
+
 # The basic set of flags needed to build "hello world" for this
 # board. This board uses libgloss and newlib.
 
@@ -58,7 +61,7 @@ if { [ istarget "arm*-none-*"] } {
     set_board_info cflags  "-specs=$specdir/rdimon.specs"
     set_board_info ldflags 	"[libgloss_link_flags] [newlib_link_flags] $additional_options"
 } else {
-    set_board_info ldflags "-static"
+    set_board_info ldflags "-lpthread -ldl"
 }
 
 # This board doesn't use a linker script.
diff --git a/config/boards/tcwg-ex40-01/a15.exp b/config/boards/build-01/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-01/a15.exp
+++ b/config/boards/build-01/a15.exp
diff --git a/config/boards/tcwg-ex40-01/a8.exp b/config/boards/build-01/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-01/a8.exp
+++ b/config/boards/build-01/a8.exp
diff --git a/config/boards/tcwg-ex40-01/a9.exp b/config/boards/build-01/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-01/a9.exp
+++ b/config/boards/build-01/a9.exp
diff --git a/config/boards/tcwg-ex40-01/aarch64.exp b/config/boards/build-01/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-01/aarch64.exp
+++ b/config/boards/build-01/aarch64.exp
diff --git a/config/boards/build-01/black.exp b/config/boards/build-01/black.exp
new file mode 100644
index 00000000..6e9de39c
--- /dev/null
+++ b/config/boards/build-01/black.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname black01
diff --git a/config/boards/build-01/build.exp b/config/boards/build-01/build.exp
new file mode 100644
index 00000000..b010dccb
--- /dev/null
+++ b/config/boards/build-01/build.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname build02
diff --git a/config/boards/tcwg-ex40-01/tcwgfoundation.exp b/config/boards/build-01/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-01/tcwgfoundation.exp
+++ b/config/boards/build-01/tcwgfoundation.exp
diff --git a/config/boards/tcwg-ex40-02/a15.exp b/config/boards/build-02/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-02/a15.exp
+++ b/config/boards/build-02/a15.exp
diff --git a/config/boards/tcwg-ex40-02/a8.exp b/config/boards/build-02/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-02/a8.exp
+++ b/config/boards/build-02/a8.exp
diff --git a/config/boards/tcwg-ex40-02/a9.exp b/config/boards/build-02/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-02/a9.exp
+++ b/config/boards/build-02/a9.exp
diff --git a/config/boards/tcwg-ex40-02/aarch64.exp b/config/boards/build-02/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-02/aarch64.exp
+++ b/config/boards/build-02/aarch64.exp
diff --git a/config/boards/build-02/black.exp b/config/boards/build-02/black.exp
new file mode 100644
index 00000000..5cb4fa8c
--- /dev/null
+++ b/config/boards/build-02/black.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname black02
diff --git a/config/boards/build-02/build.exp b/config/boards/build-02/build.exp
new file mode 100644
index 00000000..15a067ed
--- /dev/null
+++ b/config/boards/build-02/build.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname build03
diff --git a/config/boards/tcwgbuild02/tcwgfoundation.exp b/config/boards/build-02/tcwgfoundation.exp
index fc54921f..fc54921f 100644
--- a/config/boards/tcwgbuild02/tcwgfoundation.exp
+++ b/config/boards/build-02/tcwgfoundation.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgbuild01/a15.exp b/config/boards/build-03/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-02/tcwgbuild01/a15.exp
+++ b/config/boards/build-03/a15.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgbuild01/a8.exp b/config/boards/build-03/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-02/tcwgbuild01/a8.exp
+++ b/config/boards/build-03/a8.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgbuild01/a9.exp b/config/boards/build-03/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-02/tcwgbuild01/a9.exp
+++ b/config/boards/build-03/a9.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgbuild01/aarch64.exp b/config/boards/build-03/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-02/tcwgbuild01/aarch64.exp
+++ b/config/boards/build-03/aarch64.exp
diff --git a/config/boards/build-03/black.exp b/config/boards/build-03/black.exp
new file mode 100644
index 00000000..713e5f11
--- /dev/null
+++ b/config/boards/build-03/black.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname black03
diff --git a/config/boards/build-03/build.exp b/config/boards/build-03/build.exp
new file mode 100644
index 00000000..fdf53c8f
--- /dev/null
+++ b/config/boards/build-03/build.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname build04
diff --git a/config/boards/tcwgbuild03/tcwgfoundation.exp b/config/boards/build-03/tcwgfoundation.exp
index bb221d69..bb221d69 100644
--- a/config/boards/tcwgbuild03/tcwgfoundation.exp
+++ b/config/boards/build-03/tcwgfoundation.exp
diff --git a/config/boards/tcwg-ex40-03/a15.exp b/config/boards/build-04/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-03/a15.exp
+++ b/config/boards/build-04/a15.exp
diff --git a/config/boards/tcwg-ex40-03/a8.exp b/config/boards/build-04/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-03/a8.exp
+++ b/config/boards/build-04/a8.exp
diff --git a/config/boards/tcwg-ex40-03/a9.exp b/config/boards/build-04/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-03/a9.exp
+++ b/config/boards/build-04/a9.exp
diff --git a/config/boards/tcwg-ex40-03/aarch64.exp b/config/boards/build-04/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-03/aarch64.exp
+++ b/config/boards/build-04/aarch64.exp
diff --git a/config/boards/build-04/black.exp b/config/boards/build-04/black.exp
new file mode 100644
index 00000000..ae7ee367
--- /dev/null
+++ b/config/boards/build-04/black.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname black04
diff --git a/config/boards/build-04/build.exp b/config/boards/build-04/build.exp
new file mode 100644
index 00000000..fb1db7e2
--- /dev/null
+++ b/config/boards/build-04/build.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname build05
diff --git a/config/boards/tcwgbuild04/tcwgfoundation.exp b/config/boards/build-04/tcwgfoundation.exp
index 4362480d..4362480d 100644
--- a/config/boards/tcwgbuild04/tcwgfoundation.exp
+++ b/config/boards/build-04/tcwgfoundation.exp
diff --git a/config/boards/tcwg-ex40-04/a15.exp b/config/boards/build-05/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-04/a15.exp
+++ b/config/boards/build-05/a15.exp
diff --git a/config/boards/tcwg-ex40-04/a8.exp b/config/boards/build-05/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-04/a8.exp
+++ b/config/boards/build-05/a8.exp
diff --git a/config/boards/tcwg-ex40-04/a9.exp b/config/boards/build-05/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-04/a9.exp
+++ b/config/boards/build-05/a9.exp
diff --git a/config/boards/tcwg-ex40-04/aarch64.exp b/config/boards/build-05/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-04/aarch64.exp
+++ b/config/boards/build-05/aarch64.exp
diff --git a/config/boards/build-05/black.exp b/config/boards/build-05/black.exp
new file mode 100644
index 00000000..8764e971
--- /dev/null
+++ b/config/boards/build-05/black.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname black05
diff --git a/config/boards/build-05/build.exp b/config/boards/build-05/build.exp
new file mode 100644
index 00000000..8ebd18e2
--- /dev/null
+++ b/config/boards/build-05/build.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname build06
diff --git a/config/boards/tcwgbuild05/tcwgfoundation.exp b/config/boards/build-05/tcwgfoundation.exp
index 7075e038..7075e038 100644
--- a/config/boards/tcwgbuild05/tcwgfoundation.exp
+++ b/config/boards/build-05/tcwgfoundation.exp
diff --git a/config/boards/tcwg-ex40-05/a15.exp b/config/boards/build-06/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-05/a15.exp
+++ b/config/boards/build-06/a15.exp
diff --git a/config/boards/tcwg-ex40-05/a8.exp b/config/boards/build-06/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-05/a8.exp
+++ b/config/boards/build-06/a8.exp
diff --git a/config/boards/tcwg-ex40-05/a9.exp b/config/boards/build-06/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-05/a9.exp
+++ b/config/boards/build-06/a9.exp
diff --git a/config/boards/tcwg-ex40-05/aarch64.exp b/config/boards/build-06/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-05/aarch64.exp
+++ b/config/boards/build-06/aarch64.exp
diff --git a/config/boards/build-06/black.exp b/config/boards/build-06/black.exp
new file mode 100644
index 00000000..5a148734
--- /dev/null
+++ b/config/boards/build-06/black.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname black06
diff --git a/config/boards/build-06/build.exp b/config/boards/build-06/build.exp
new file mode 100644
index 00000000..55e70b60
--- /dev/null
+++ b/config/boards/build-06/build.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname build01
diff --git a/config/boards/tcwgbuild06/tcwgfoundation.exp b/config/boards/build-06/tcwgfoundation.exp
index dea522b0..dea522b0 100644
--- a/config/boards/tcwgbuild06/tcwgfoundation.exp
+++ b/config/boards/build-06/tcwgfoundation.exp
diff --git a/config/boards/tcwgchrome2.exp b/config/boards/chrome2.exp
index ec8a94f5..ec8a94f5 100644
--- a/config/boards/tcwgchrome2.exp
+++ b/config/boards/chrome2.exp
diff --git a/config/boards/d01.exp b/config/boards/d01.exp
new file mode 100644
index 00000000..9197d2c6
--- /dev/null
+++ b/config/boards/d01.exp
@@ -0,0 +1,3 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname d01-01
diff --git a/config/boards/tcwg-ex40-06/a15.exp b/config/boards/ex40-01/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-06/a15.exp
+++ b/config/boards/ex40-01/a15.exp
diff --git a/config/boards/tcwg-ex40-06/a8.exp b/config/boards/ex40-01/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-06/a8.exp
+++ b/config/boards/ex40-01/a8.exp
diff --git a/config/boards/tcwg-ex40-06/a9.exp b/config/boards/ex40-01/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-06/a9.exp
+++ b/config/boards/ex40-01/a9.exp
diff --git a/config/boards/tcwg-ex40-06/aarch64.exp b/config/boards/ex40-01/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-06/aarch64.exp
+++ b/config/boards/ex40-01/aarch64.exp
diff --git a/config/boards/tcwg-ex40-01/tcwgblack.exp b/config/boards/ex40-01/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-01/tcwgblack.exp
+++ b/config/boards/ex40-01/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-01/tcwgbuild.exp b/config/boards/ex40-01/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-01/tcwgbuild.exp
+++ b/config/boards/ex40-01/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgbuild01/tcwgfoundation.exp b/config/boards/ex40-01/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-02/tcwgbuild01/tcwgfoundation.exp
+++ b/config/boards/ex40-01/tcwgfoundation.exp
diff --git a/config/boards/tcwg-ex40-07/a15.exp b/config/boards/ex40-02/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-07/a15.exp
+++ b/config/boards/ex40-02/a15.exp
diff --git a/config/boards/tcwg-ex40-07/a8.exp b/config/boards/ex40-02/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-07/a8.exp
+++ b/config/boards/ex40-02/a8.exp
diff --git a/config/boards/tcwg-ex40-07/a9.exp b/config/boards/ex40-02/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-07/a9.exp
+++ b/config/boards/ex40-02/a9.exp
diff --git a/config/boards/tcwg-ex40-07/aarch64.exp b/config/boards/ex40-02/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-07/aarch64.exp
+++ b/config/boards/ex40-02/aarch64.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgblack.exp b/config/boards/ex40-02/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-02/tcwgblack.exp
+++ b/config/boards/ex40-02/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgbuild.exp b/config/boards/ex40-02/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-02/tcwgbuild.exp
+++ b/config/boards/ex40-02/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-08/a15.exp b/config/boards/ex40-02/tcwgbuild01/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-08/a15.exp
+++ b/config/boards/ex40-02/tcwgbuild01/a15.exp
diff --git a/config/boards/tcwg-ex40-08/a8.exp b/config/boards/ex40-02/tcwgbuild01/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-08/a8.exp
+++ b/config/boards/ex40-02/tcwgbuild01/a8.exp
diff --git a/config/boards/tcwg-ex40-08/a9.exp b/config/boards/ex40-02/tcwgbuild01/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-08/a9.exp
+++ b/config/boards/ex40-02/tcwgbuild01/a9.exp
diff --git a/config/boards/tcwg-ex40-08/aarch64.exp b/config/boards/ex40-02/tcwgbuild01/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-08/aarch64.exp
+++ b/config/boards/ex40-02/tcwgbuild01/aarch64.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgbuild01/tcwgblack.exp b/config/boards/ex40-02/tcwgbuild01/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-02/tcwgbuild01/tcwgblack.exp
+++ b/config/boards/ex40-02/tcwgbuild01/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgbuild01/tcwgbuild.exp b/config/boards/ex40-02/tcwgbuild01/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-02/tcwgbuild01/tcwgbuild.exp
+++ b/config/boards/ex40-02/tcwgbuild01/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-02/tcwgfoundation.exp b/config/boards/ex40-02/tcwgbuild01/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-02/tcwgfoundation.exp
+++ b/config/boards/ex40-02/tcwgbuild01/tcwgfoundation.exp
diff --git a/config/boards/tcwg-ex40-03/tcwgfoundation.exp b/config/boards/ex40-02/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-03/tcwgfoundation.exp
+++ b/config/boards/ex40-02/tcwgfoundation.exp
diff --git a/config/boards/tcwg-ex40-09/a15.exp b/config/boards/ex40-03/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwg-ex40-09/a15.exp
+++ b/config/boards/ex40-03/a15.exp
diff --git a/config/boards/tcwg-ex40-09/a8.exp b/config/boards/ex40-03/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwg-ex40-09/a8.exp
+++ b/config/boards/ex40-03/a8.exp
diff --git a/config/boards/tcwg-ex40-09/a9.exp b/config/boards/ex40-03/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwg-ex40-09/a9.exp
+++ b/config/boards/ex40-03/a9.exp
diff --git a/config/boards/tcwg-ex40-09/aarch64.exp b/config/boards/ex40-03/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwg-ex40-09/aarch64.exp
+++ b/config/boards/ex40-03/aarch64.exp
diff --git a/config/boards/tcwg-ex40-03/tcwgblack.exp b/config/boards/ex40-03/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-03/tcwgblack.exp
+++ b/config/boards/ex40-03/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-03/tcwgbuild.exp b/config/boards/ex40-03/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-03/tcwgbuild.exp
+++ b/config/boards/ex40-03/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-04/tcwgfoundation.exp b/config/boards/ex40-03/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-04/tcwgfoundation.exp
+++ b/config/boards/ex40-03/tcwgfoundation.exp
diff --git a/config/boards/tcwgbuild01/a15.exp b/config/boards/ex40-04/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwgbuild01/a15.exp
+++ b/config/boards/ex40-04/a15.exp
diff --git a/config/boards/tcwgbuild01/a8.exp b/config/boards/ex40-04/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwgbuild01/a8.exp
+++ b/config/boards/ex40-04/a8.exp
diff --git a/config/boards/tcwgbuild01/a9.exp b/config/boards/ex40-04/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwgbuild01/a9.exp
+++ b/config/boards/ex40-04/a9.exp
diff --git a/config/boards/tcwgbuild01/aarch64.exp b/config/boards/ex40-04/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwgbuild01/aarch64.exp
+++ b/config/boards/ex40-04/aarch64.exp
diff --git a/config/boards/tcwg-ex40-04/tcwgblack.exp b/config/boards/ex40-04/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-04/tcwgblack.exp
+++ b/config/boards/ex40-04/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-04/tcwgbuild.exp b/config/boards/ex40-04/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-04/tcwgbuild.exp
+++ b/config/boards/ex40-04/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-05/tcwgfoundation.exp b/config/boards/ex40-04/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-05/tcwgfoundation.exp
+++ b/config/boards/ex40-04/tcwgfoundation.exp
diff --git a/config/boards/tcwgbuild02/a15.exp b/config/boards/ex40-05/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwgbuild02/a15.exp
+++ b/config/boards/ex40-05/a15.exp
diff --git a/config/boards/tcwgbuild02/a8.exp b/config/boards/ex40-05/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwgbuild02/a8.exp
+++ b/config/boards/ex40-05/a8.exp
diff --git a/config/boards/tcwgbuild02/a9.exp b/config/boards/ex40-05/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwgbuild02/a9.exp
+++ b/config/boards/ex40-05/a9.exp
diff --git a/config/boards/tcwgbuild02/aarch64.exp b/config/boards/ex40-05/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwgbuild02/aarch64.exp
+++ b/config/boards/ex40-05/aarch64.exp
diff --git a/config/boards/tcwg-ex40-05/tcwgblack.exp b/config/boards/ex40-05/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-05/tcwgblack.exp
+++ b/config/boards/ex40-05/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-05/tcwgbuild.exp b/config/boards/ex40-05/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-05/tcwgbuild.exp
+++ b/config/boards/ex40-05/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-06/tcwgfoundation.exp b/config/boards/ex40-05/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-06/tcwgfoundation.exp
+++ b/config/boards/ex40-05/tcwgfoundation.exp
diff --git a/config/boards/tcwgbuild03/a15.exp b/config/boards/ex40-06/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwgbuild03/a15.exp
+++ b/config/boards/ex40-06/a15.exp
diff --git a/config/boards/tcwgbuild03/a8.exp b/config/boards/ex40-06/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwgbuild03/a8.exp
+++ b/config/boards/ex40-06/a8.exp
diff --git a/config/boards/tcwgbuild03/a9.exp b/config/boards/ex40-06/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwgbuild03/a9.exp
+++ b/config/boards/ex40-06/a9.exp
diff --git a/config/boards/tcwgbuild03/aarch64.exp b/config/boards/ex40-06/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwgbuild03/aarch64.exp
+++ b/config/boards/ex40-06/aarch64.exp
diff --git a/config/boards/tcwg-ex40-06/tcwgblack.exp b/config/boards/ex40-06/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-06/tcwgblack.exp
+++ b/config/boards/ex40-06/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-06/tcwgbuild.exp b/config/boards/ex40-06/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-06/tcwgbuild.exp
+++ b/config/boards/ex40-06/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-07/tcwgfoundation.exp b/config/boards/ex40-06/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-07/tcwgfoundation.exp
+++ b/config/boards/ex40-06/tcwgfoundation.exp
diff --git a/config/boards/tcwgbuild04/a15.exp b/config/boards/ex40-07/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwgbuild04/a15.exp
+++ b/config/boards/ex40-07/a15.exp
diff --git a/config/boards/tcwgbuild04/a8.exp b/config/boards/ex40-07/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwgbuild04/a8.exp
+++ b/config/boards/ex40-07/a8.exp
diff --git a/config/boards/tcwgbuild04/a9.exp b/config/boards/ex40-07/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwgbuild04/a9.exp
+++ b/config/boards/ex40-07/a9.exp
diff --git a/config/boards/tcwgbuild04/aarch64.exp b/config/boards/ex40-07/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwgbuild04/aarch64.exp
+++ b/config/boards/ex40-07/aarch64.exp
diff --git a/config/boards/tcwg-ex40-07/tcwgblack.exp b/config/boards/ex40-07/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-07/tcwgblack.exp
+++ b/config/boards/ex40-07/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-07/tcwgbuild.exp b/config/boards/ex40-07/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-07/tcwgbuild.exp
+++ b/config/boards/ex40-07/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-08/tcwgfoundation.exp b/config/boards/ex40-07/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-08/tcwgfoundation.exp
+++ b/config/boards/ex40-07/tcwgfoundation.exp
diff --git a/config/boards/tcwgbuild05/a15.exp b/config/boards/ex40-08/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwgbuild05/a15.exp
+++ b/config/boards/ex40-08/a15.exp
diff --git a/config/boards/tcwgbuild05/a8.exp b/config/boards/ex40-08/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwgbuild05/a8.exp
+++ b/config/boards/ex40-08/a8.exp
diff --git a/config/boards/tcwgbuild05/a9.exp b/config/boards/ex40-08/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwgbuild05/a9.exp
+++ b/config/boards/ex40-08/a9.exp
diff --git a/config/boards/tcwgbuild05/aarch64.exp b/config/boards/ex40-08/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwgbuild05/aarch64.exp
+++ b/config/boards/ex40-08/aarch64.exp
diff --git a/config/boards/tcwg-ex40-08/tcwgblack.exp b/config/boards/ex40-08/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-08/tcwgblack.exp
+++ b/config/boards/ex40-08/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-08/tcwgbuild.exp b/config/boards/ex40-08/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-08/tcwgbuild.exp
+++ b/config/boards/ex40-08/tcwgbuild.exp
diff --git a/config/boards/tcwg-ex40-09/tcwgfoundation.exp b/config/boards/ex40-08/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwg-ex40-09/tcwgfoundation.exp
+++ b/config/boards/ex40-08/tcwgfoundation.exp
diff --git a/config/boards/tcwgbuild06/a15.exp b/config/boards/ex40-09/a15.exp
index 52c1e1cf..52c1e1cf 100644
--- a/config/boards/tcwgbuild06/a15.exp
+++ b/config/boards/ex40-09/a15.exp
diff --git a/config/boards/tcwgbuild06/a8.exp b/config/boards/ex40-09/a8.exp
index d23519c4..d23519c4 100644
--- a/config/boards/tcwgbuild06/a8.exp
+++ b/config/boards/ex40-09/a8.exp
diff --git a/config/boards/tcwgbuild06/a9.exp b/config/boards/ex40-09/a9.exp
index d57bc699..d57bc699 100644
--- a/config/boards/tcwgbuild06/a9.exp
+++ b/config/boards/ex40-09/a9.exp
diff --git a/config/boards/tcwgbuild06/aarch64.exp b/config/boards/ex40-09/aarch64.exp
index 64e85e92..64e85e92 100644
--- a/config/boards/tcwgbuild06/aarch64.exp
+++ b/config/boards/ex40-09/aarch64.exp
diff --git a/config/boards/tcwg-ex40-09/tcwgblack.exp b/config/boards/ex40-09/tcwgblack.exp
index 0ef73510..0ef73510 100644
--- a/config/boards/tcwg-ex40-09/tcwgblack.exp
+++ b/config/boards/ex40-09/tcwgblack.exp
diff --git a/config/boards/tcwg-ex40-09/tcwgbuild.exp b/config/boards/ex40-09/tcwgbuild.exp
index 528de460..528de460 100644
--- a/config/boards/tcwg-ex40-09/tcwgbuild.exp
+++ b/config/boards/ex40-09/tcwgbuild.exp
diff --git a/config/boards/tcwgbuild01/tcwgfoundation.exp b/config/boards/ex40-09/tcwgfoundation.exp
index f0baac52..f0baac52 100644
--- a/config/boards/tcwgbuild01/tcwgfoundation.exp
+++ b/config/boards/ex40-09/tcwgfoundation.exp
diff --git a/config/boards/juno.exp b/config/boards/juno.exp
new file mode 100644
index 00000000..6a3d48fc
--- /dev/null
+++ b/config/boards/juno.exp
@@ -0,0 +1,4 @@
+load_generic_config tcwgcommon
+
+set_board_info hostname juno-01
+
diff --git a/config/boards/tcwglava.exp b/config/boards/lava.exp
index dd76abeb..24773ac4 100644
--- a/config/boards/tcwglava.exp
+++ b/config/boards/lava.exp
@@ -7,4 +7,4 @@ set_board_info rcp_prog /usr/bin/scp
 set_board_info gcc,timeout 100000
 
 set_board_info hostname @LAVA_BOARD@
-set_board_info lava_json /home/maxim-kuvyrkov/src/cbuild2/config/boards/lava.json
+set_board_info lava_json /home/maxim-kuvyrkov/src/abe/config/boards/lava.json
diff --git a/config/boards/tcwgapm.exp b/config/boards/tcwgapm.exp
deleted file mode 100644
index d50fa9f1..00000000
--- a/config/boards/tcwgapm.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_generic_config tcwgcommon
-
-set_board_info hostname tcwg-apm-04
diff --git a/config/boards/tcwgblack.exp b/config/boards/tcwgblack.exp
deleted file mode 100644
index c00ed176..00000000
--- a/config/boards/tcwgblack.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_generic_config tcwgcommon
-
-set_board_info hostname tcwgblack06
diff --git a/config/boards/tcwgrob/arm-odroidU2.exp b/config/boards/tcwgrob/arm-odroidU2.exp
index 5b016d4b..cd8f697d 100644
--- a/config/boards/tcwgrob/arm-odroidU2.exp
+++ b/config/boards/tcwgrob/arm-odroidU2.exp
@@ -6,7 +6,7 @@ set_board_info hostname arm-odroidU2
 
 set_board_info protocol fastssh
 # Enable ControlMaster and ControlPath
-set_board_info rsh_opts "-o ControlMaster=auto -o ControlPath=\"/tmp/cbuild-%u@%h:[pid]\" -o ControlPersist=6h"
+set_board_info rsh_opts "-o ControlMaster=auto -o ControlPath=\"/tmp/abe-%u@%h:[pid]\" -o ControlPersist=6h"
 
 #set_board_info username buildslave
 set_board_info gcc,timeout 100000
diff --git a/config/gcc.conf b/config/gcc.conf
index 6882bab8..81d259d2 100644
--- a/config/gcc.conf
+++ b/config/gcc.conf
@@ -74,24 +74,24 @@ if test x"${build}" != x"${target}"; then
    # Add platform specific flags
     case ${target} in
 	arm-*linux-gnueabi)
-	    default_configure_flags="${default_configure_flags} --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=softfp --with-mode=thumb"
+	    default_configure_flags="${default_configure_flags} --with-tune=cortex-a9 --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=softfp  --with-mode=thumb"
 	    need_qemu=yes
 	    ;;
 	arm-*linux-gnueabihf)
-	    default_configure_flags="${default_configure_flags} --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb"
+	    default_configure_flags="${default_configure_flags} --with-tune=cortex-a9 --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb"
 	    need_qemu=no
 	    ;;
 	armeb-*linux-gnueabi)
-	    default_configure_flags="${default_configure_flags} --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=softfp --with-mode=thumb --disable-multilib"
+	    default_configure_flags="${default_configure_flags} --with-tune=cortex-a9 --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=softfp --with-mode=thumb --disable-multilib"
 	    need_qemu=yes
 	    ;;
 	armeb-*linux-gnueabihf)
-	    default_configure_flags="${default_configure_flags} --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb --disable-multilib"
+	    default_configure_flags="${default_configure_flags} --with-tune=cortex-a9 --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb --disable-multilib"
 	    need_qemu=yes
 	    ;;
 	    # bare metal targets don't support threads.
 	arm*-elf|arm*-eabi*)
-	    default_configure_flags="${default_configure_flags} --enable-threads=no"
+	    default_configure_flags="${default_configure_flags} --with-tune=cortex-a9 --enable-threads=no --with-arch=armv7-a --with-fpu=vfpv3-d16"
 	    need_qemu=yes
             languages="c,c++,lto"
 	    ;;
@@ -145,7 +145,8 @@ if test x"${build}" != x"${target}"; then
    fi
     # The sysroot path depends on the C library version.
    if test x"${tarbin}" = xyes; then
-        local sysroot="/opt/linaro/sysroot-${libc_version}-${target}"
+#        local sysroot="/opt/linaro/sysroot-${libc_version}-${target}/libc"
+       local sysroot="${local_builds}/destdir/${host}/libc"
     else
 	local sysroot="${local_builds}/sysroot-${target}"
     fi
diff --git a/config/gdbserver.conf b/config/gdbserver.conf
index f9d16964..fd4b0465 100644
--- a/config/gdbserver.conf
+++ b/config/gdbserver.conf
@@ -6,7 +6,7 @@ latest="binutils-gdb.git/gdb_7_6-branch"
 # If yes, only static linking will be used
 static_link=yes
 
-default_configure_flags="LDFLAGS=-static"
+default_configure_flags="LDFLAGS=-static CFLAGS=--sysroot=${sysroots}"
 
 # This is a list of default flags always supplied to "make check".
 runtest_flags=""
diff --git a/config/linaro.exp b/config/linaro.exp
index 367601a9..8996e4b6 100644
--- a/config/linaro.exp
+++ b/config/linaro.exp
@@ -52,6 +52,7 @@ case "$target_triplet" in {
 #		set target_list { tcwgchromebook }
 #		set target_list { tcwgd01 }
 #		set target_list { chrome1-01 }
+#		set target_list { "arm-qemu" } 
 		set target_list { dragon-01 }
 	    }
 	    { build-* tcwg-ex40-* d01-* apm-* juno-* amd-* } {
@@ -60,6 +61,12 @@ case "$target_triplet" in {
 	    { natived01-* nativeapm-* nativejuno-* nativeamd-* } {
 		set target_list { unix }
 	    }
+	    default{
+		global SIM
+		# CPU and sysroot are set through the environment
+		set SIM "qemu-arm"
+		set target_list { "arm-qemu" } 
+            }
 	}
     }
     { "arm-*-eabi*" } {
@@ -86,6 +93,10 @@ case "$target_triplet" in {
 	    { nativeapm-* nativejuno-* nativeamd-* } {
 		set target_list { unix }
 	    }
+	    default {
+		set SIM "qemu-aarch64"
+                set target_list { aarch64-qemu }
+            }
 	}
     }
     { "x86_64-*linux-gnu" "i686-*linux-gnu" } {
diff --git a/configure b/configure
index 0dda4c24..f176a717 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cbuild 2.0dev.
+# Generated by GNU Autoconf 2.69 for abe 2.0dev.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -574,14 +574,14 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='cbuild'
-PACKAGE_TARNAME='cbuild'
+PACKAGE_NAME='abe'
+PACKAGE_TARNAME='abe'
 PACKAGE_VERSION='2.0dev'
-PACKAGE_STRING='cbuild 2.0dev'
+PACKAGE_STRING='abe 2.0dev'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
-ac_unique_file="cbuild2.sh"
+ac_unique_file="abe.sh"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 NEWWORKDIR
@@ -604,12 +604,11 @@ LOCAL_BUILDS
 GIT_REFERENCE_DIR
 LOCAL_SNAPSHOTS
 SYSROOTS
-CBUILD_PATH
+ABE_PATH
 SOURCES_CONF
 FILESERVER
-CBUILD_TOP
+ABE_TOP
 BUILDDATE
-CCRYPT
 AUTOGEN
 BISON
 FLEX
@@ -1255,7 +1254,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cbuild 2.0dev to adapt to many kinds of systems.
+\`configure' configures abe 2.0dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1303,7 +1302,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/cbuild]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/abe]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1316,7 +1315,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cbuild 2.0dev:";;
+     short | recursive ) echo "Configuration of abe 2.0dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1429,7 +1428,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cbuild configure 2.0dev
+abe configure 2.0dev
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1568,7 +1567,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cbuild $as_me 2.0dev, which was
+It was created by abe $as_me 2.0dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2966,7 +2965,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test x"${CC}" = x -a x"${CXX}" = x; then
-   as_fn_error $? "You need 'gcc' and 'g++' to fully run cbuild!" "$LINENO" 5
+   as_fn_error $? "You need 'gcc' and 'g++' to fully run abe!" "$LINENO" 5
    missing="${missing} gcc"
 fi
 ac_aux_dir=
@@ -3158,8 +3157,8 @@ fi
 
 
 if test x"${WGET}" = x; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need 'wget' to fully run cbuild!" >&5
-$as_echo "$as_me: WARNING: You need 'wget' to fully run cbuild!" >&2;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need 'wget' to fully run abe!" >&5
+$as_echo "$as_me: WARNING: You need 'wget' to fully run abe!" >&2;}
    missing="${missing} wget"
 fi
 
@@ -3477,52 +3476,6 @@ $as_echo "$as_me: WARNING: You need 'autogen' to run configure for GCC properly!
    missing="${missing} autogen"
 fi
 
-# Extract the first word of "ccrypt", so it can be a program name with args.
-set dummy ccrypt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CCRYPT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CCRYPT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CCRYPT="$CCRYPT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CCRYPT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CCRYPT=$ac_cv_path_CCRYPT
-if test -n "$CCRYPT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCRYPT" >&5
-$as_echo "$CCRYPT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test x"${CCRYPT}" = x; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need 'ccrypt' to run benchmarks, this can be ignored for builds" >&5
-$as_echo "$as_me: WARNING: You need 'ccrypt' to run benchmarks, this can be ignored for builds" >&2;}
-   missing="${missing} ccrypt"
-fi
-
 #AC_CHECK_LIB(ncurses, doupdate)
 #if test x${ac_cv_lib_ncurses_doupdate} != x"yes"; then
 #   AC_MSG_WARN([You need 'libncurses' to run configure for GDB properly!])
@@ -3694,17 +3647,17 @@ fi
 
 # Check whether --with-toplevel was given.
 if test "${with_toplevel+set}" = set; then :
-  withval=$with_toplevel; CBUILD_TOP=${withval}
+  withval=$with_toplevel; ABE_TOP=${withval}
 else
-  CBUILD_TOP="${PWD}"
+  ABE_TOP="${PWD}"
 fi
 
 
 
-if test ! -d ${CBUILD_TOP}; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${CBUILD_TOP} does not exist so creating directory!" >&5
-$as_echo "$as_me: WARNING: ${CBUILD_TOP} does not exist so creating directory!" >&2;}
-   mkdir -p ${CBUILD_TOP}
+if test ! -d ${ABE_TOP}; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${ABE_TOP} does not exist so creating directory!" >&5
+$as_echo "$as_me: WARNING: ${ABE_TOP} does not exist so creating directory!" >&2;}
+   mkdir -p ${ABE_TOP}
 fi
 
 # The various Jenkins jobs copy log files and rest results to a remote file
@@ -3729,7 +3682,7 @@ fi
 
 
 
-CBUILD_PATH=$(readlink -f ${srcdir})
+ABE_PATH=$(readlink -f ${srcdir})
 
 
 
@@ -3737,7 +3690,7 @@ CBUILD_PATH=$(readlink -f ${srcdir})
 if test "${with_sysroot+set}" = set; then :
   withval=$with_sysroot; SYSROOTS=${withval}
 else
-  SYSROOTS="${CBUILD_TOP}"/sysroots
+  SYSROOTS="${ABE_TOP}"/sysroots
 fi
 
 
@@ -3755,7 +3708,7 @@ fi
 if test "${with_local_snapshots+set}" = set; then :
   withval=$with_local_snapshots; LOCAL_SNAPSHOTS=${withval}
 else
-  LOCAL_SNAPSHOTS="${CBUILD_TOP}/snapshots"
+  LOCAL_SNAPSHOTS="${ABE_TOP}/snapshots"
 fi
 
 
@@ -3781,7 +3734,7 @@ fi
 if test "${with_local_builds+set}" = set; then :
   withval=$with_local_builds; LOCAL_BUILDS=${withval}
 else
-  LOCAL_BUILDS="${CBUILD_TOP}/builds"
+  LOCAL_BUILDS="${ABE_TOP}/builds"
 fi
 
 
@@ -4762,7 +4715,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cbuild $as_me 2.0dev, which was
+This file was extended by abe $as_me 2.0dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4815,7 +4768,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cbuild config.status 2.0dev
+abe config.status 2.0dev
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index dff00fe0..7be381b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,8 @@ dnl build and test a GNU toolchain.
 dnl 
 
 AC_PREREQ(2.59c)
-AC_INIT(cbuild, 2.0dev)
-AC_CONFIG_SRCDIR([cbuild2.sh])
+AC_INIT(abe, 2.0dev)
+AC_CONFIG_SRCDIR([abe.sh])
 dnl AC_CONFIG_HEADERS([config.h])
 dnl AC_CONFIG_MACRO_DIR([macros])
 
@@ -33,7 +33,7 @@ missing=
 AC_PROG_CC
 AC_PROG_CXX
 if test x"${CC}" = x -a x"${CXX}" = x; then
-   AC_MSG_ERROR([You need 'gcc' and 'g++' to fully run cbuild!])
+   AC_MSG_ERROR([You need 'gcc' and 'g++' to fully run abe!])
    missing="${missing} gcc"
 fi
 AC_PROG_INSTALL
@@ -68,7 +68,7 @@ AC_SUBST(DISTRIBUTION)
 AC_PATH_PROG(WGET, wget)
 AC_SUBST(WGET)
 if test x"${WGET}" = x; then
-   AC_MSG_WARN([You need 'wget' to fully run cbuild!])
+   AC_MSG_WARN([You need 'wget' to fully run abe!])
    missing="${missing} wget"
 fi
 
@@ -109,12 +109,6 @@ if test x"${AUTOGEN}" = x; then
    missing="${missing} autogen"
 fi
 
-AC_PATH_PROG(CCRYPT, ccrypt)
-if test x"${CCRYPT}" = x; then
-   AC_MSG_WARN([You need 'ccrypt' to run benchmarks, this can be ignored for builds])
-   missing="${missing} ccrypt"
-fi
-
 dnl Building GDB requires ncurses and termcap
 #AC_CHECK_LIB(ncurses, doupdate)
 #if test x${ac_cv_lib_ncurses_doupdate} != x"yes"; then
@@ -205,7 +199,7 @@ BUILDDATE="`date +%Y%m%d`"
 AC_SUBST(BUILDDATE)
 
 dnl While it's a bad idea to store the database access information in an unencrypted
-dnl text file, this is useful for cbuild2 development itself. This option should never
+dnl text file, this is useful for abe development itself. This option should never
 dnl be used in a production environment. The default is read-only access. You can also
 dnl set DBUSER and DBPASSWD in your environment, but that's also a possible security
 dnl risk.
@@ -224,16 +218,16 @@ AC_ARG_WITH(dbhost,
   dbhost=${withval} ; AC_MSG_WARN([The database hostname is stored in an unencrypted text file which could be considered a security risk!]),
   dbhost='localhost')
 
-dnl The top of the cbuild tree
+dnl The top of the abe tree
 AC_ARG_WITH(toplevel,
   AC_HELP_STRING([--with-toplevel], []),
-  CBUILD_TOP=${withval},
-  CBUILD_TOP="${PWD}")
-AC_SUBST(CBUILD_TOP)
+  ABE_TOP=${withval},
+  ABE_TOP="${PWD}")
+AC_SUBST(ABE_TOP)
 
-if test ! -d ${CBUILD_TOP}; then
-   AC_MSG_WARN([${CBUILD_TOP} does not exist so creating directory!])
-   mkdir -p ${CBUILD_TOP}
+if test ! -d ${ABE_TOP}; then
+   AC_MSG_WARN([${ABE_TOP} does not exist so creating directory!])
+   mkdir -p ${ABE_TOP}
 fi
 
 # The various Jenkins jobs copy log files and rest results to a remote file
@@ -250,14 +244,14 @@ AC_ARG_WITH(sources-conf,
   SOURCES_CONF="${srcdir}/config/sources.conf")
 AC_SUBST(SOURCES_CONF)
 
-CBUILD_PATH=$(readlink -f ${srcdir})
-AC_SUBST(CBUILD_PATH)
+ABE_PATH=$(readlink -f ${srcdir})
+AC_SUBST(ABE_PATH)
 
-dnl The top of the cbuild tree
+dnl The top of the abe tree
 AC_ARG_WITH(sysroot,
   AC_HELP_STRING([--with-sysroot], []),
   SYSROOTS=${withval},
-  SYSROOTS="${CBUILD_TOP}"/sysroots)
+  SYSROOTS="${ABE_TOP}"/sysroots)
 AC_SUBST(SYSROOTS)
 
 if test x"${target}" != x"${build}"; then
@@ -271,7 +265,7 @@ dnl The local directory where snapshots are stored
 AC_ARG_WITH(local-snapshots,
   AC_HELP_STRING([--with-local-snapshots], [Where downloaded tarballs are stored]),
   LOCAL_SNAPSHOTS=${withval},
-  LOCAL_SNAPSHOTS="${CBUILD_TOP}/snapshots")
+  LOCAL_SNAPSHOTS="${ABE_TOP}/snapshots")
 AC_SUBST(LOCAL_SNAPSHOTS)
 
 if test ! -d ${LOCAL_SNAPSHOTS}; then
@@ -290,7 +284,7 @@ dnl The top directory for make install, also where all the components we build l
 AC_ARG_WITH(local-builds,
   AC_HELP_STRING([--with-local-builds], []),
   LOCAL_BUILDS=${withval},
-  LOCAL_BUILDS="${CBUILD_TOP}/builds")
+  LOCAL_BUILDS="${ABE_TOP}/builds")
 AC_SUBST(LOCAL_BUILDS)
 
 if test ! -d ${LOCAL_BUILDS}; then
@@ -394,7 +388,7 @@ AC_SUBST(ENABLE_PARALLEL)
 dnl AC_ARG_WITH(snapshots,
 dnl   AC_HELP_STRING([--with-snapshots], []),
 dnl   snapshots=${withval},
-dnl   snapshots='cbuild')
+dnl   snapshots='abe')
 
 dnl Since the configure script is actually checked in, a developer
 dnl does not need to have the GNU Autotools installed. However,
diff --git a/host.conf.in b/host.conf.in
index a04255a4..19a8bacb 100644
--- a/host.conf.in
+++ b/host.conf.in
@@ -7,8 +7,8 @@ dbhost=@DBPASSWD@
 local_snapshots=@LOCAL_SNAPSHOTS@
 git_reference_dir=@GIT_REFERENCE_DIR@
 remote_snapshots=@REMOTE_SNAPSHOTS@
-cbuild_top=@CBUILD_TOP@
-cbuild_path=@CBUILD_PATH@
+abe_top=@ABE_TOP@
+abe_path=@ABE_PATH@
 
 sources_conf=@SOURCES_CONF@
 
@@ -43,5 +43,4 @@ bash_shell=@BASH@
 LSBCC=@LSBCC@
 LSBCXX=@LSBCXX@
 MAKEINFO=@MAKEINFO@
-CCRYPT=@CCRYPT@
 NEWWORKDIR=@NEWWORKDIR@
diff --git a/jenkins.sh b/jenkins.sh
index 6395a946..b48dc656 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -21,7 +21,7 @@ usage()
 {
     # Format this section with 75 columns.
     cat << EOF
-  jenkins.sh [--help] [-s snapshot dir] [g git reference dir] [cbuildv2 path] [w workspace]
+  jenkins.sh [--help] [-s snapshot dir] [g git reference dir] [abe path] [w workspace]
 EOF
     return 0
 }
@@ -54,16 +54,16 @@ user_snapshots="${user_workspace}/snapshots"
 # The release version string, usually a date
 releasestr=
 
-# This is a string of optional extra arguments to pass to cbuild at runtime
+# This is a string of optional extra arguments to pass to abe at runtime
 user_options=""
 
-OPTS="`getopt -o s:g:c:w:o:f:l:t:h -l snapshots:gitrepo:cbuild:workspace:options:fileserver:languages:target:help -- "$@"`"
+OPTS="`getopt -o s:g:c:w:o:f:l:t:h -l snapshots:gitrepo:abe:workspace:options:fileserver:languages:target:help -- "$@"`"
 while test $# -gt 0; do
     echo 1 = "$1"
     case $1 in
         -s|--snapshots) user_snapshots=$2 ;;
         -g|--gitrepo) user_git_repo=$2 ;;
-        -c|--cbuild) cbuild_dir=$2 ;;
+        -c|--abe) abe_dir=$2 ;;
 	-t|--target) target=$2 ;;
         -w|--workspace) user_workspace=$2 ;;
         -o|--options) user_options=$2 ;;
@@ -162,7 +162,7 @@ fi
 # Use the newly created build directory
 pushd ${user_workspace}/_build
 
-# Configure Cbuildv2 itself. Force the use of bash instead of the Ubuntu
+# Configure Abe itself. Force the use of bash instead of the Ubuntu
 # default of dash as some configure scripts go into an infinite loop with
 # dash. Not good...
 export CONFIG_SHELL="/bin/bash"
@@ -170,10 +170,10 @@ if test x"${debug}" = x"true"; then
     export CONFIG_SHELL="/bin/bash -x"
 fi
 
-if test x"${cbuild_dir}" = x; then
-    cbuild_dir=${topdir}
+if test x"${abe_dir}" = x; then
+    abe_dir=${topdir}
 fi
-$CONFIG_SHELL ${cbuild_dir}/configure --with-local-snapshots=${user_snapshots} --with-git-reference-dir=${shared}/snapshots --with-fileserver=${fileserver} --with-languages=${languages} --enable-schroot-test
+$CONFIG_SHELL ${abe_dir}/configure --with-local-snapshots=${user_snapshots} --with-git-reference-dir=${shared}/snapshots --with-fileserver=${fileserver} --with-languages=${languages} --enable-schroot-test
 
 # Double parallelism for tcwg-ex40-* machines to compensate for really-remote
 # target execution.  GCC testsuites will run with -j 32.
@@ -186,8 +186,8 @@ if test -e "${PWD}/host.conf"; then
     . "${PWD}/host.conf"
 fi
 
-# This is the top level directory for the cbuild2 sources.
-#cbuild_dir="${cbuild_path}"
+# This is the top level directory for the abe sources.
+#abe_dir="${abe_path}"
 
 # Delete the previous test result files to avoid problems.
 find ${user_workspace} -name \*.sum -exec rm {} \;  2>&1 > /dev/null
@@ -207,9 +207,9 @@ fi
 
 # Now we build the cross compiler, for a native compiler this becomes
 # the stage2 bootstrap build.
-$CONFIG_SHELL ${cbuild_dir}/cbuild2.sh --parallel ${check} ${tars} ${releasestr} ${platform} ${change} ${bootstrap} --timeout 100 --build all --disable make_docs > build.out 2> >(tee build.err >&2)
+$CONFIG_SHELL ${abe_dir}/abe.sh --parallel ${check} ${tars} ${releasestr} ${platform} ${change} ${bootstrap} --timeout 100 --build all --disable make_docs > build.out 2> >(tee build.err >&2)
 
-# If cbuild2 returned an error, make jenkins see this as a build failure
+# If abe returned an error, make jenkins see this as a build failure
 if test $? -gt 0; then
     echo "================= TAIL OF LOG: BEGIN ================="
     tail -n 50 build.out
@@ -306,7 +306,7 @@ if test x"${runtests}" = xtrue; then
 #if test x"${sums}" != x; then
 #    for i in ${sums}; do
 #	name="`basename $i`"
-#	${cbuild_dir}/sum2junit.sh $i $user_workspace/${name}.junit
+#	${abe_dir}/sum2junit.sh $i $user_workspace/${name}.junit
 #	cp $i ${user_workspace}/results/${dir}
 #    done
 #    junits="`find ${user_workspace} -name *.junit`"
@@ -325,13 +325,13 @@ sums="`find ${user_workspace} -name *.sum`"
 # Canadian Crosses are a win32 hosted cross toolchain built on a Linux
 # machine.
 if test x"${canadian}" = x"true"; then
-    $CONFIG_SHELL ${cbuild_dir}/cbuild2.sh --nodepends --parallel ${change} ${platform} --build all
+    $CONFIG_SHELL ${abe_dir}/abe.sh --nodepends --parallel ${change} ${platform} --build all
     distro="`lsb_release -sc`"
     # Ubuntu Lucid uses an older version of Mingw32
     if test x"${distro}" = x"lucid"; then
-	$CONFIG_SHELL ${cbuild_dir}/cbuild2.sh --nodepends --parallel ${change} ${tars} --host=i586-mingw32msvc ${platform} --build all
+	$CONFIG_SHELL ${abe_dir}/abe.sh --nodepends --parallel ${change} ${tars} --host=i586-mingw32msvc ${platform} --build all
     else
-	$CONFIG_SHELL ${cbuild_dir}/cbuild2.sh --nodepends --parallel ${change} ${tars} --host=i686-w64-mingw32 ${platform} --build all
+	$CONFIG_SHELL ${abe_dir}/abe.sh --nodepends --parallel ${change} ${tars} --host=i686-w64-mingw32 ${platform} --build all
     fi
 fi
 
@@ -354,13 +354,13 @@ if test x"${sums}" != x -o x"${runtests}" != x"true"; then
 	logs="`find ${user_workspace} -name make\*.log`"
 	cp ${logs} ${logs_dir}/
 
-	# Copy stdout and stderr output from cbuild2.
+	# Copy stdout and stderr output from abe.
 	cp build.out build.err ${logs_dir}/
 
 	xz ${logs_dir}/*
 	scp ${logs_dir}/* ${fileserver}:${basedir}/${dir}/
 	rm -rf ${logs_dir}
-	scp ${cbuild_dir}/tcwgweb.sh ${fileserver}:/tmp/tcwgweb$$.sh
+	scp ${abe_dir}/tcwgweb.sh ${fileserver}:/tmp/tcwgweb$$.sh
 	ssh ${fileserver} /tmp/tcwgweb$$.sh --email --base ${basedir}/${dir}
 	ssh ${fileserver} rm -f /tmp/tcwgweb$$.sh
 
@@ -369,7 +369,7 @@ if test x"${sums}" != x -o x"${runtests}" != x"true"; then
     if test x"${tarsrc}" = xtrue -a x"${release}" != x; then
 	allfiles="`ls ${shared}/snapshots/*${release}*.xz`"
 	srcfiles="`echo ${allfiles} | egrep -v "arm|aarch"`"
-	scp ${srcfiles} ${fileserver}:/home/cbuild/var/snapshots/
+	scp ${srcfiles} ${fileserver}:/home/abe/var/snapshots/
 	rm -f ${srcfiles}
     fi
 
diff --git a/lib/checkout.sh b/lib/checkout.sh
index 604ff58a..2459c987 100644
--- a/lib/checkout.sh
+++ b/lib/checkout.sh
@@ -24,7 +24,7 @@
 # but we also want to work with the native source code control system.
 usegit=no
 
-# This is used by cbuild2.sh --checkout all but not by --build
+# This is used by abe.sh --checkout all but not by --build
 checkout_infrastructure()
 {
     trace "$*"
@@ -282,7 +282,7 @@ checkout()
 		# dryrun "(cd ${srcdir} && git checkout -B ${branch})"
 	    elif test x"${supdate}" = xyes; then
 		# Some packages allow the build to modify the source directory and
-		# that might screw up cbuild2's state so we restore a pristine branch.
+		# that might screw up abe's state so we restore a pristine branch.
 		notice "Updating sources for ${tool} in ${srcdir}"
 		dryrun "(cd ${repodir} && git stash --all)"
 		dryrun "(cd ${repodir} && git reset --hard)"
diff --git a/lib/common.sh b/lib/common.sh
index dbbbd085..996e1e89 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -57,7 +57,7 @@ set_dbpasswd()
     dbpasswd="$1"
 }
 
-# if --dryrun is passed to cbuild2.sh, then commands are echoed instead of
+# if --dryrun is passed to abe.sh, then commands are echoed instead of
 # of executed.
 dryrun()
 {
diff --git a/lib/diff.sh b/lib/diff.sh
index 94657364..8b1276cf 100644
--- a/lib/diff.sh
+++ b/lib/diff.sh
@@ -32,8 +32,8 @@ difftwodirs ()
     echo "Diffing: ${prev} against ${next}..."
     local resultsdir="${local_builds}/test-results"
 
-    local pversion="`echo ${prev} | grep -o "test-results/cbuild[0-9a-z]*" | grep -o "cbuild[0-9a-z]*"`"
-    local nversion="`echo ${next} | grep -o "test-results/cbuild[0-9a-z]*" | grep -o "cbuild[0-9a-z]*"`"
+    local pversion="`echo ${prev} | grep -o "test-results/abe[0-9a-z]*" | grep -o "abe[0-9a-z]*"`"
+    local nversion="`echo ${next} | grep -o "test-results/abe[0-9a-z]*" | grep -o "abe[0-9a-z]*"`"
 
     diffdir="${resultsdir}/diffof-${pversion}-${nversion}"
     mkdir -p ${diffdir}
@@ -111,9 +111,9 @@ diffall ()
 # This produces the test file, who's header needs to look like this:
 #
 # Difference in testsuite results between:
-#  gcc-linaro-4.8-2014.01 build i686-precise-cbuild461-oort8-i686r1
+#  gcc-linaro-4.8-2014.01 build i686-precise-abe461-oort8-i686r1
 # and the one before it:
-#  gcc-linaro-4.8-2013.12 build i686-precise-cbuild461-oort2-i686r1
+#  gcc-linaro-4.8-2013.12 build i686-precise-abe461-oort2-i686r1
 
 # ------
 testfile()
diff --git a/lib/gerrit.sh b/lib/gerrit.sh
index 410aaaa0..8061ced8 100644
--- a/lib/gerrit.sh
+++ b/lib/gerrit.sh
@@ -25,7 +25,7 @@
     # ssh -p 29418 robert.savoye@git.linaro.org gerrit version
     # this uses the git commit SHA-1
     # ssh -p 29418 robert.savoye@git.linaro.org gerrit review --code-review 0 -m "foo" a87c53e83236364fe9bc7d5ffdbf3c307c64707d
-    # ssh -p 29418 robert.savoye@git.linaro.org gerrit review --project toolchain/cbuild2 --code-review 0 -m "foobar" a87c53e83236364fe9bc7d5ffdbf3c307c64707d
+    # ssh -p 29418 robert.savoye@git.linaro.org gerrit review --project toolchain/abe --code-review 0 -m "foobar" a87c53e83236364fe9bc7d5ffdbf3c307c64707d
     # ssh -p 29418 robert.savoye@git.linaro.org gerrit query --current-patch-set gcc status:open limit:1 --format JSON
 
 # The number used for code reviews looks like this, it's passed as a string to
@@ -37,7 +37,7 @@
 #   +2 Looks good to me, approved
 
 
-# ssh -p 29418 robert.savoye@git.linaro.org gerrit review --project toolchain/cbuild2 --code-review "+2" -m "foobar" 55957eaff3d80d854062544dea6fc0eedcbf9247 --submit
+# ssh -p 29418 robert.savoye@git.linaro.org gerrit review --project toolchain/abe --code-review "+2" -m "foobar" 55957eaff3d80d854062544dea6fc0eedcbf9247 --submit
 
     # local revision="@`cd ${srcdir} && git log --oneline | head -1 | cut -d ' ' -f 1`"
 
@@ -215,7 +215,7 @@ Your patch is being reviewed. The build step has completed with a status of: ${s
 
 EOF
 
-#http://cbuild.validation.linaro.org/logs/gcc-linaro-5.0.0/
+#http://abe.validation.linaro.org/logs/gcc-linaro-5.0.0/
 
     add_gerrit_comment ${revision} ${msgfile} ${code}
     if test $? -gt 0; then
diff --git a/lib/git-parser.sh b/lib/git-parser.sh
index 5474af62..07ee400f 100644
--- a/lib/git-parser.sh
+++ b/lib/git-parser.sh
@@ -64,7 +64,7 @@
 #       The revision designation that follows the repository, e.g.,
 #       binutils.git@12345
 #
-#         Note: cbuild allows <repo>.git/branch@revision even though
+#         Note: abe allows <repo>.git/branch@revision even though
 #               when a revision is present, the 'branch' is only used
 #               in path names, since a revision implies a branch already.
 #
diff --git a/lib/globals.sh b/lib/globals.sh
index d50bdb6d..2f64286f 100644
--- a/lib/globals.sh
+++ b/lib/globals.sh
@@ -68,14 +68,14 @@ distribution=
 make_flags=
 
 # These can be changed by environment variables
-if test x"${SNAPSHOTS_URL}" != x -o x"${CBUILD_SNAPSHOTS}" != x; then
+if test x"${SNAPSHOTS_URL}" != x -o x"${ABE_SNAPSHOTS}" != x; then
     snapshots="${SNAPSHOTS_URL}"
 fi
-if test x"${CBUILD_DBUSER}" != x; then
-    dbuser="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    dbuser="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    dbpasswd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    dbpasswd="${ABE_DBPASSWD}"
 fi
 
 clobber=no
@@ -115,7 +115,7 @@ jenkins_job_url=""
 
 # source a user specific config file for commonly used configure options.
 # These overide any of the above values.
-if test -e ~/.cbuildrc; then
-    . ~/.cbuildrc
+if test -e ~/.aberc; then
+    . ~/.aberc
 fi
 
diff --git a/lib/make.sh b/lib/make.sh
index 5631134a..d8c2bc7a 100755
--- a/lib/make.sh
+++ b/lib/make.sh
@@ -27,7 +27,7 @@ build_all()
     # Specify the components, in order to get a full toolchain build
     if test x"${target}" != x"${build}"; then
         local builds="infrastructure binutils stage1 libc stage2 gdb"
-	if test "`echo ${target} | grep -c -- -none-`" -eq 0; then
+	if test "`echo ${target} | grep -c -- -linux-`" -eq 1; then
 	    local builds="${builds} gdbserver"
 	fi
         notice "Buildall: Building \"${builds}\" for cross target ${target}."
@@ -107,7 +107,7 @@ build_all()
                     local sysroot="`${target}-gcc -print-sysroot`"
                     if test ! -d ${sysroot}; then
                         dryrun "mkdir -p /opt/linaro"
-                        dryrun "ln -sfnT ${cbuild_top}/sysroots/${target} ${sysroot}"
+                        dryrun "ln -sfnT ${abe_top}/sysroots/${target} ${sysroot}"
                     fi
                 fi
                 ;; 
@@ -198,7 +198,7 @@ build_all()
             fi
             binary_toolchain
         fi
-        if test "`echo ${with_packages} | grep -c sysroot`" -gt 0; then
+        if test "`echo ${with_packages} | grep -c sysroot`" -gt 0 -a x"${build}" != x"${target}"; then
             binary_sysroot
         fi
 #        if test "`echo ${with_packages} | grep -c gdb`" -gt 0; then
@@ -409,7 +409,7 @@ make_all()
     local default_makeflags="`read_config $1 default_makeflags`"
 
     if test x"${tool}" = x"gdb" -a x"$2" == x"gdbserver"; then
-       default_makeflags="gdbserver CFLAGS=--sysroot=${local_builds}/sysroot-${target}"
+       default_makeflags="gdbserver CFLAGS=--sysroot=${sysroots}"
     fi
 
     if test x"${default_makeflags}" !=  x; then
@@ -710,7 +710,7 @@ make_check()
     # Run tests
     local checklog="${builddir}/check-${tool}.log"
     if test x"${build}" = x"${target}" -a x"${tarbin}" != x"yes"; then
-        dryrun "make check RUNTESTFLAGS=\"${runtest_flags}\" ${make_flags} -w -i -k -C ${builddir} 2>&1 | tee ${checklog}"
+        dryrun "make check RUNTESTFLAGS=\"${runtest_flags} --xml=${tool}.xml \" ${make_flags} -w -i -k -C ${builddir} 2>&1 | tee ${checklog}"
     else
 	local exec_tests
 	exec_tests=false
@@ -757,6 +757,10 @@ make_check()
 		local check_targets="check"
 		;;
 	esac
+	if test x"${tool}" = x"gcc"; then
+            touch ${sysroots}/etc/ld.so.cache
+            chmod 700 ${sysroots}/etc/ld.so.cache
+	fi
 
 	for i in ${dirs}; do
             dryrun "make ${check_targets} SYSROOT_UNDER_TEST=${sysroots} FLAGS_UNDER_TEST=\"\" PREFIX_UNDER_TEST=\"${local_builds}/destdir/${host}/bin/${target}-\" RUNTESTFLAGS=\"${runtest_flags}\" ${schroot_make_opts} ${make_flags} -w -i -k -C ${builddir}$i 2>&1 | tee ${checklog}"
@@ -764,6 +768,10 @@ make_check()
 
 	# Stop schroot sessions
 	stop_schroot_sessions "$schroot_port" ${schroot_boards}
+       
+        if test x"${tool}" = x"gcc"; then
+            rm -rf ${sysroots}/etc/ld.so.cache
+	fi
     fi
 
     return 0
diff --git a/lib/merge.sh b/lib/merge.sh
index 83fadc92..f57625c8 100644
--- a/lib/merge.sh
+++ b/lib/merge.sh
@@ -85,7 +85,7 @@ merge_branch()
 	month="`date +%m`"
 	day="`date +%d`"
 	
-	# If no email address is in ~/.cbuildrc, create one
+	# If no email address is in ~/.aberc, create one
 	if test x"${email}" = x; then
 	    email="${LOGNAME}@`hostname`"
 	fi
diff --git a/lib/package.sh b/lib/package.sh
index df111b93..535619b2 100644
--- a/lib/package.sh
+++ b/lib/package.sh
@@ -213,6 +213,9 @@ binary_toolchain()
 #    local installdir="`dirname ${installdir} | sed -e 's:/bin::'`"
     dryrun "ln -sfnT ${local_builds}/destdir/${host} ${destdir}"
 
+    # FIXME: link the sysroot into the toolchain tarball
+    ln -sfnT ${sysroots} ${destdir}/libc
+
     # make the tarball from the tree we just created.
     notice "Making binary tarball for toolchain, please wait..."
     dryrun "tar Jcfh ${local_snapshots}/${tag}.tar.xz --directory=/tmp/linaro.$$ ${exclude} ${tag}"
@@ -279,10 +282,10 @@ binary_sysroot()
 	local tag="sysroot-linaro-${clibrary}-gcc${version}-${release}-${target}"
     fi
 
-#    dryrun "cp -fr ${cbuild_top}/sysroots/${target} ${destdir}"
+#    dryrun "cp -fr ${abe_top}/sysroots/${target} ${destdir}"
     local destdir="/tmp/linaro.$$/${tag}"
     dryrun "mkdir -p /tmp/linaro.$$"
-    dryrun "ln -sfnT ${cbuild_top}/sysroots/${target} ${destdir}"
+    dryrun "ln -sfnT ${abe_top}/sysroots/${target} ${destdir}"
 
     # Generate the install script
     sysroot_install_script ${destdir}
@@ -347,7 +350,7 @@ manifest()
     local srcdir="`get_srcdir ${binutils_version}`"
     local binutils_revision=="`get_git_revision ${srcdir}`"
 
-    local cbuild_revision="`get_git_revision ${cbuild_path}`"
+    local abe_revision="`get_git_revision ${abe_path}`"
 
      rm -f ${outfile}
     cat >> ${outfile} <<EOF 
@@ -375,8 +378,8 @@ gdb_version=${gdb_version}
 gdb_revsion=${gdb_revision}
 linux_version=${linux_version}
 
-# Cbuild revision used
-cbuild_revision=${cbuild_revision}
+# Abe revision used
+abe_revision=${abe_revision}
 
 EOF
 
@@ -513,7 +516,7 @@ binutils_src_tarball()
     return 0
 }
 
-# This installs a binary tarball produced by cbuild2, and runs make check
+# This installs a binary tarball produced by abe, and runs make check
 test_binary_toolchain()
 {
     # Binaries get installed here if possible
diff --git a/lib/release.sh b/lib/release.sh
index 7c236266..8355321d 100755
--- a/lib/release.sh
+++ b/lib/release.sh
@@ -58,7 +58,7 @@ sign_tarball()
 {
     trace "$*"
 
-#    ssh -t cbuild@toolchain64 gpg --no-use-agent -q --yes --passphrase-file /home/cbuild/.config/cbuild/password --armor --sign --detach-sig --default-key cbuild "/home/cbuild/var/snapshots/gcc-linaro-${release}.tar.xz" scp cbuild@toolchain64:/home/cbuild/var/snapshots/gcc-linaro-${release}.tar.xz.asc $REL_DIR
+#    ssh -t abe@toolchain64 gpg --no-use-agent -q --yes --passphrase-file /home/abe/.config/abe/password --armor --sign --detach-sig --default-key abe "/home/abe/var/snapshots/gcc-linaro-${release}.tar.xz" scp abe@toolchain64:/home/abe/var/snapshots/gcc-linaro-${release}.tar.xz.asc $REL_DIR
 
     return 0
 }
@@ -116,7 +116,7 @@ release_binutils_src()
 
 # From: https://wiki.linaro.org/WorkingGroups/ToolChain/GCC/ReleaseProcess
 # The output file name looks like this: gcc-linaro-4.8-2013.11.tar.xz.
-# The date is set by the --release option to Cbuildv2. This function is
+# The date is set by the --release option to Abe. This function is
 # only called with --tarsrc or --tarball.
 release_gcc_src()
 {
diff --git a/lib/stamp.sh b/lib/stamp.sh
index 054ddbb8..af71648e 100644
--- a/lib/stamp.sh
+++ b/lib/stamp.sh
@@ -100,7 +100,7 @@ create_stamp()
 #       you should not proceed with processing.
 #
 #   255 - There is an error condition during stamp generation.  This is
-#         a bug in cbuild2 or the filesystem.
+#         a bug in abe or the filesystem.
 #
 check_stamp()
 {
diff --git a/runbenchmark.sh b/runbenchmark.sh
index c1ef8c2f..228bee0c 100755
--- a/runbenchmark.sh
+++ b/runbenchmark.sh
@@ -225,13 +225,13 @@ fi
 
 $extract || $clean || $build || $run || { extract=true;clean=true;build=true;run=true; }
 
-#Cribbed from cbuild2.sh
+#Cribbed from abe.sh
 #TODO: Push this change back to last merge? Not really needed if I submit generated patches.
 #      But may still be worth it for my sanity.
 make_docs=no
 install=no
 
-#TODO How does primary cbuild2 do this?
+#TODO How does primary abe do this?
 dump_host_info  > host.txt
 #fetch md5sums
 
diff --git a/scripts/Backport.job b/scripts/Backport.job
index 645ff249..d87549bb 100755
--- a/scripts/Backport.job
+++ b/scripts/Backport.job
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cbuild_dir="${WORKSPACE}/cbuildv2"
+abe_dir="${WORKSPACE}/abe"
 user_snapshots="${WORKSPACE}/snapshots"
 shared="/home/buildslave/workspace/shared/"
 snapshots_ref="${shared}/snapshots"
@@ -13,15 +13,15 @@ Files-Pattern: *
 License-Type: open
 EOF
 
-rm -fr ${WORKSPACE}
+rm -fr ${WORKSPACE}/_build/builds/* ${WORKSPACE}/_build/sysroots/*
 mkdir -p ${WORKSPACE}/_build
 cd ${WORKSPACE}/_build
 
-$CONFIG_SHELL ${cbuild_dir}/configure --with-local-snapshots=${user_snapshots} --with-git-reference-dir=${snapshots_ref} --with-fileserver=148.251.136.42
+$CONFIG_SHELL ${abe_dir}/configure --with-local-snapshots=${user_snapshots} --with-git-reference-dir=${snapshots_ref}
 
-$CONFIG_SHELL -x ${cbuild_dir}/test-backport.sh --fileserver=148.251.136.42 --target ${target} ${gcc_branch}
+$CONFIG_SHELL -x ${abe_dir}/test-backport.sh --target ${target} ${gcc_branch}
 
-# force a failure of cbuild2 has build problems.
+# force a failure of abe has build problems.
 if test $? -gt 0; then
   exit 1
 fi
diff --git a/scripts/BuildFarm.job b/scripts/BuildFarm.job
index 7c2ba00f..9119fb9f 100755
--- a/scripts/BuildFarm.job
+++ b/scripts/BuildFarm.job
@@ -9,7 +9,7 @@ EOF
 
 export CONFIG_SHELL="/bin/bash"
 shared="/home/buildslave/workspace/shared"
-cbuild_dir="${WORKSPACE}/cbuildv2"
+abe_dir="${WORKSPACE}/abe"
 user_snapshots="${WORKSPACE}/snapshots"
 snapshots_ref="${shared}/snapshots"
 fileserver="abe.tcwglab.linaro.org"
@@ -35,10 +35,10 @@ rm -fr ${WORKSPACE}/_build
 mkdir -p ${WORKSPACE}/_build
 
 cd ${WORKSPACE}/_build
-$CONFIG_SHELL ${cbuild_dir}/configure --disable-update --with-local-snapshots=${user_snapshots} --with-git-reference-dir=${snapshots_ref} --with-languages=${languages} --enable-schroot-test
-$CONFIG_SHELL -x ${cbuild_dir}/jenkins.sh ${release}
+$CONFIG_SHELL ${abe_dir}/configure --disable-update --with-local-snapshots=${user_snapshots} --with-git-reference-dir=${snapshots_ref} --with-languages=${languages} --enable-schroot-test
+$CONFIG_SHELL -x ${abe_dir}/jenkins.sh ${release}
 
-# force a failure of cbuild2 has build problems.
+# force a failure of abe has build problems.
 if test $? -gt 0; then
   exit 1
 fi
diff --git a/scripts/MakeRelease.job b/scripts/MakeRelease.job
index 915c42b1..0e8b5d1e 100755
--- a/scripts/MakeRelease.job
+++ b/scripts/MakeRelease.job
@@ -31,7 +31,7 @@ if test x"${target}" != x"native" -a x"${target}" != x; then
 fi
 
 shared="/home/buildslave/workspace/shared/"
-cbuild_dir="${user_workspace}/cbuildv2"
+abe_dir="${user_workspace}/abe"
 user_snapshots="${user_workspace}/snapshots"
 
 if test -e ${user_workspace}; then
@@ -54,7 +54,7 @@ fi
 cd ${user_workspace}/_build
 
 if ! test -e host.conf; then
-  $CONFIG_SHELL ${cbuild_dir}/configure --with-local-snapshots=${user_snapshots} \
+  $CONFIG_SHELL ${abe_dir}/configure --with-local-snapshots=${user_snapshots} \
       --with-git-reference-dir=${shared}/snapshots --with-fileserver=${fileserver}
 fi
 
@@ -68,7 +68,7 @@ fi
 
 # Build a toolchain, run the tests, and the create a source release as a tarball
 if test x"${tarsrc}" = x"yes"; then
-    $CONFIG_SHELL ${cbuild_dir}/cbuild2.sh --disable update --release ${release} \
+    $CONFIG_SHELL ${abe_dir}/abe.sh --disable update --release ${release} \
 	--tarsrc ${check} gcc=${gcc_source} ${platform} -build all
 fi
 
@@ -76,15 +76,15 @@ fi
 if test x"${tarbin}" = x"yes"; then
     # Canadian cross builds require a Linux hosted crfoss compiler first
     if test x"${canadian}" = x"true"; then
-	$CONFIG_SHELL ${cbuild_dir}/cbuild2.sh --disable update --release ${release} ${check} gcc=${gcc_source} ${platform} --build all
+	$CONFIG_SHELL ${abe_dir}/abe.sh --disable update --release ${release} ${check} gcc=${gcc_source} ${platform} --build all
 	host="--host i686-w64-mingw32"
     else
 	host=""
     fi
-    $CONFIG_SHELL ${cbuild_dir}/cbuild2.sh --disable update --release ${release} --tarbin ${check} gcc=${gcc_source} ${platform} ${host} --build all
+    $CONFIG_SHELL ${abe_dir}/abe.sh --disable update --release ${release} --tarbin ${check} gcc=${gcc_source} ${platform} ${host} --build all
 fi
 
-# force a failure if cbuild2 has build problems.
+# force a failure if abe has build problems.
 if test $? -gt 0; then
   exit 1
 fi
@@ -95,8 +95,8 @@ if test x"${nocheck}" = xyes; then
 fi
 
 # Copy the source build test results and tarballs to the fileserver
-bases="/work/cbuildv2/baselines/${release}/${target}"
-snaps="/home/cbuild/var/snapshots/"
+bases="/work/abe/baselines/${release}/${target}"
+snaps="/home/abe/var/snapshots/"
 if test x"${tarsrc}" = x"yes"; then
     manifest="`find ${user_workspace} -name manifest.txt`"
     scp ${manifest} ${fileserver}:${bases}/
@@ -144,7 +144,7 @@ if test x"${tarbin}" = xyes; then
 	fi
 	
 	# Diff the two directories
-	scp ${cbuild_dir}/tcwgweb.sh ${fileserver}:/tmp/tcwgweb$$.sh
+	scp ${abe_dir}/tcwgweb.sh ${fileserver}:/tmp/tcwgweb$$.sh
 	out="`ssh ${fileserver} "if test -e ${bases}; then echo YES; else echo NO; fi"`"
 	if test x"${out}" = x"YES"; then 
 	    out="`ssh ${fileserver} /tmp/tcwgweb$$.sh --email --tdir ${bases} ${binaries}; fi`"
diff --git a/tcwgweb.sh b/tcwgweb.sh
index 1ab01ce4..1708942a 100755
--- a/tcwgweb.sh
+++ b/tcwgweb.sh
@@ -22,9 +22,9 @@ if test -e "${PWD}/host.conf"; then
 fi
 
 # load commonly used functions
-cbuild="`which $0`"
-topdir="${cbuild_path}"
-cbuild2="`basename $0`"
+abe="`which $0`"
+topdir="${abe_path}"
+abe="`basename $0`"
 
 . "${topdir}/lib/common.sh" || exit 1
 
@@ -86,7 +86,7 @@ diffbaseline ()
 {
     source $1/manifest.txt
 
-    local baselines="/work/cbuildv2/baselines"
+    local baselines="/work/abe/baselines"
     local tool="`echo $2 | cut -d '-' -f 1`"
     local tool="`basename ${tool}`"
     local version="`echo $2 | grep -o "[0-9]\.[0-9]*" | head -1`"
@@ -253,9 +253,9 @@ diffall ()
 # This produces the test file, who's header needs to look like this:
 #
 # Difference in testsuite results between:
-#  gcc-linaro-4.8-2014.01 build i686-precise-cbuild461-oort8-i686r1
+#  gcc-linaro-4.8-2014.01 build i686-precise-abe461-oort8-i686r1
 # and the one before it:
-#  gcc-linaro-4.8-2013.12 build i686-precise-cbuild461-oort2-i686r1
+#  gcc-linaro-4.8-2013.12 build i686-precise-abe461-oort2-i686r1
 
 # ------
 testfile()
diff --git a/test-backport.sh b/test-backport.sh
index 4dadb36b..b9d0f652 100755
--- a/test-backport.sh
+++ b/test-backport.sh
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# To run, this script takes arguments in the same format as cbuild2.sh. The two
+# To run, this script takes arguments in the same format as abe.sh. The two
 # arguments it needs is the target archicture to build, and the gcc backport
 # branch name. Example:
 # $PATH/test-backport.sh --target arm-linux-gnueabihf gcc.git~4.9-backport-209419
@@ -39,11 +39,11 @@ fi
 if test -e "${PWD}/host.conf"; then
     . "${PWD}/host.conf"
 else
-    echo "Error: this script needs to be run from a configured Cbuild2 tree!" 1>&2
+    echo "Error: this script needs to be run from a configured Abe tree!" 1>&2
 fi
-cbuild="`which $0`"
-topdir="${cbuild_path}"
-cbuild2="`basename $0`"
+abe="`which $0`"
+topdir="${abe_path}"
+abe="`basename $0`"
 
 repo="gcc.git"
 fileserver=""
@@ -86,12 +86,12 @@ declare -a revisions=(`cd ${srcdir} && git log -n 2 | grep ^commit | cut -d ' '
 # Force GCC to not build the docs
 export BUILD_INFO=""
 
-resultsdir="/tmp/cbuild-${target}@"
+resultsdir="/tmp/abe-${target}@"
 i=0
 while test $i -lt ${#revisions[@]}; do
-    bash -x ${topdir}/cbuild2.sh --disable update --check --target ${target} gcc=gcc.git@${revisions[$i]} --build all --disable make_docs
+    bash -x ${topdir}/abe.sh --disable update --check --target ${target} gcc=gcc.git@${revisions[$i]} --build all --disable make_docs
     if test $? -gt 0; then
-	echo "ERROR: Cbuild2 failed!"
+	echo "ERROR: Abe failed!"
 	exit 1
     fi
     sums="`find ${local_builds}/${build}/${target} -name \*.sum`"
diff --git a/test.sh b/test.sh
index e1d5f972..818a7236 100755
--- a/test.sh
+++ b/test.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
-testcbuild2="`basename $0`"
+testabe="`basename $0`"
 topdir=`dirname $0`
-cbuild_path=`readlink -f ${topdir}`
-export cbuild_path
+abe_path=`readlink -f ${topdir}`
+export abe_path
 
 # Source common.sh for some common utilities.
-. ${cbuild_path}/lib/common.sh || exit 1
+. ${abe_path}/lib/common.sh || exit 1
 
 # We use a tmp/ directory for the builddir in order that we don't pollute the
 # srcdir or an existing builddir.
-tmpdir=`mktemp -d /tmp/cbuild2.$$.XXX`
+tmpdir=`mktemp -d /tmp/abe.$$.XXX`
 if test "$?" -gt 0; then
     error "mktemp of ${tmpdir} failed."
     exit 1
 fi
 
-# Log files for cbuild test runs are dumped here.
+# Log files for abe test runs are dumped here.
 testlogs=${tmpdir}/testlogs
 mkdir -p ${testlogs}
 if test "$?" -gt 0; then
@@ -29,14 +29,14 @@ runintmpdir=
 # existing build dir, otherwise we're in the srcdir so we need to run
 # configure in the tmpdir and run the tests from there.
 if test ! -e "${PWD}/host.conf"; then
-    (cd ${tmpdir} && ${cbuild_path}/configure --with-sources-conf=${cbuild_path}/testsuite/test_sources.conf)
+    (cd ${tmpdir} && ${abe_path}/configure --with-sources-conf=${abe_path}/testsuite/test_sources.conf)
     runintmpdir=yes
 else
     # copy the md5sums file from the existing snapshots directory to the new local_snapshots directory.
 
     # Override $local_snapshots so that the local_snapshots directory of an
     # existing build is not moved or damaged.  This affects all called
-    # instances of cbuild2.sh below.
+    # instances of abe.sh below.
     export local_snapshots="${tmpdir}/snapshots"
     out="`mkdir -p ${local_snapshots}`"
     if test "$?" -gt 0; then
@@ -44,19 +44,19 @@ else
         exit 1
     fi
     # Override the existing sources_conf setting in host.conf.
-    export sources_conf=${cbuild_path}testsuite/test_sources.conf
+    export sources_conf=${abe_path}testsuite/test_sources.conf
 fi
 
 export wget_quiet=yes
 
 usage()
 {
-    echo "  ${testcbuild2} [--debug|-v]"
+    echo "  ${testabe} [--debug|-v]"
     echo "                 [--md5sums <path/to/alternative/snapshots/md5sums>]"
     echo ""
-    echo "  ${testcbuild2} is the cbuild2 frontend command conformance test."
+    echo "  ${testabe} is the abe frontend command conformance test."
     echo ""
-    echo " ${testcbuild2} should be run from the source directory."
+    echo " ${testabe} should be run from the source directory."
 }
 
 passes=0
@@ -157,7 +157,7 @@ test_failure()
     local match=$2
     local out=
 
-    out="`(${runintmpdir:+cd ${tmpdir}} && ${cbuild_path}/cbuild2.sh ${cb_commands} 2>&1 | tee ${testlogs}/${testlineno}.log | grep "${match}" | sed -e 's:\(^ERROR\).*\('"${match}"'\).*:\1 \2:')`"
+    out="`(${runintmpdir:+cd ${tmpdir}} && ${abe_path}/abe.sh ${cb_commands} 2>&1 | tee ${testlogs}/${testlineno}.log | grep "${match}" | sed -e 's:\(^ERROR\).*\('"${match}"'\).*:\1 \2:')`"
     cbtest ${testlineno} "${out}" "ERROR ${match}" "ERROR ${cb_commands}"
 }
 
@@ -169,7 +169,7 @@ test_pass()
     local out=
 
     # Continue to search for error so we don't get false positives.
-    out="`(${runintmpdir:+cd ${tmpdir}} && ${cbuild_path}/cbuild2.sh ${cb_commands} 2>&1 | tee ${testlogs}/${testlineno}.log | grep "${match}" | sed -e 's:\(^ERROR\).*\('"${match}"'\).*:\1 \2:')`"
+    out="`(${runintmpdir:+cd ${tmpdir}} && ${abe_path}/abe.sh ${cb_commands} 2>&1 | tee ${testlogs}/${testlineno}.log | grep "${match}" | sed -e 's:\(^ERROR\).*\('"${match}"'\).*:\1 \2:')`"
     cbtest ${testlineno} "${out}" "${match}" "VALID ${cb_commands}"
 }
 
@@ -607,7 +607,7 @@ test_pass "${cb_commands}" "${match}"
 # be grepped in 'match'... yet.
 cb_commands="--dryrun --build gcc.git --stage 2"
 testlineno="`expr $LINENO + 1`"
-out="`(${runintmpdir:+cd ${tmpdir}} && ${cbuild_path}/cbuild2.sh ${cb_commands} 2>&1 | tee ${testlogs}/${testlineno}.log | grep -c " build.*gcc.*stage2")`"
+out="`(${runintmpdir:+cd ${tmpdir}} && ${abe_path}/abe.sh ${cb_commands} 2>&1 | tee ${testlogs}/${testlineno}.log | grep -c " build.*gcc.*stage2")`"
 if test ${out} -gt 0; then
     pass ${testlineno} "VALID: --dryrun --build gcc.git --stage 2"
 else
@@ -630,7 +630,7 @@ if test x"${tmpdir}" = x"/tmp"; then
     echo "\n${local_snapshots} doesn't conform to /tmp/<tmpdir>/snapshots. Not safe to remove."
 elif test -d "${tmpdir}/snapshots" -a ${failures} -lt 1; then
     echo ""
-    echo "${testcbuild2} finished with no unexpected failures. Removing ${tmpdir}"
+    echo "${testabe} finished with no unexpected failures. Removing ${tmpdir}"
     rm -rf ${tmpdir}
 fi
 
diff --git a/testsuite/gerrit-tests.sh b/testsuite/gerrit-tests.sh
index c860e310..8df440af 100755
--- a/testsuite/gerrit-tests.sh
+++ b/testsuite/gerrit-tests.sh
@@ -7,7 +7,7 @@ cat <<EOF > ${review}
 [gerrit]
 	host=review.linaro.org
 	port=29418
-	project=toolchain/cbuild2
+	project=toolchain/abe
 
 [gitreview]
 	username=buildslave
@@ -32,7 +32,7 @@ else
 fi
 
 out="`extract_gerrit_project ${srcdir}`"
-if test x"${out}" = x"toolchain/cbuild2"; then
+if test x"${out}" = x"toolchain/abe"; then
     pass extract_gerrit_project""
 else
     ${fail_state} "extract_gerrit_project"
diff --git a/testsuite/git-parser-tests.sh b/testsuite/git-parser-tests.sh
index 70d5f63f..b72bbe53 100644
--- a/testsuite/git-parser-tests.sh
+++ b/testsuite/git-parser-tests.sh
@@ -1000,7 +1000,7 @@ match='linux'
 test_parser tool "${in}" "${match}" "${errmatch}"
 
 errmatch=0
-in="http://cbuild.validation.linaro.org/snapshots/gdb-7.6~20121001+git3e2e76a.tar"
+in="http://abe.validation.linaro.org/snapshots/gdb-7.6~20121001+git3e2e76a.tar"
 match='gdb'
 test_parser repo "${in}" "${match}" "${errmatch}"
 
diff --git a/testsuite/normalize-tests.sh b/testsuite/normalize-tests.sh
index e15fba12..37df3116 100644
--- a/testsuite/normalize-tests.sh
+++ b/testsuite/normalize-tests.sh
@@ -81,7 +81,7 @@ else
     fixme "${in} returned ${out}"
 fi
 
-in="http://cbuild.validation.linaro.org/snapshots/gcc-linaro-4.8-2013.06-1.tar.xz"
+in="http://abe.validation.linaro.org/snapshots/gcc-linaro-4.8-2013.06-1.tar.xz"
 out="`normalize_path ${in}`"
 if test x"${out}" = x"gcc-linaro-4.8-2013.06-1"; then
     pass "normalize_path: tarball compressed"
diff --git a/testsuite/srcdir-tests.sh b/testsuite/srcdir-tests.sh
index 53c1e34e..3a9c09ac 100644
--- a/testsuite/srcdir-tests.sh
+++ b/testsuite/srcdir-tests.sh
@@ -100,11 +100,11 @@ fi
 
 echo "============= additional get_srcdir () tests ================"
 # Some of these are redundant with those in srcdir_tests but since
-# already have cbuild2.git checked out we might as well test them here.
+# already have abe.git checked out we might as well test them here.
 testing="get_srcdir: <repo>.git"
-in="cbuild2.git"
+in="abe.git"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git"; then
+if test x"${out}" = x"${local_snapshots}/abe.git"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -112,9 +112,9 @@ else
 fi
 
 testing="get_srcdir: <repo>.git@<revision>"
-in="cbuild2.git@12345"
+in="abe.git@12345"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git@12345"; then
+if test x"${out}" = x"${local_snapshots}/abe.git@12345"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -122,9 +122,9 @@ else
 fi
 
 testing="get_srcdir: <repo>.git/<branch>"
-in="cbuild2.git/branch"
+in="abe.git/branch"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git~branch"; then
+if test x"${out}" = x"${local_snapshots}/abe.git~branch"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -132,9 +132,9 @@ else
 fi
 
 testing="get_srcdir: <repo>.git/<branch>@<revision>"
-in="cbuild2.git/branch@12345"
+in="abe.git/branch@12345"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git~branch@12345"; then
+if test x"${out}" = x"${local_snapshots}/abe.git~branch@12345"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -142,9 +142,9 @@ else
 fi
 
 testing="get_srcdir: <repo>.git~<branch>@<revision>"
-in="cbuild2.git~branch@12345"
+in="abe.git~branch@12345"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git~branch@12345"; then
+if test x"${out}" = x"${local_snapshots}/abe.git~branch@12345"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -152,9 +152,9 @@ else
 fi
 
 testing="get_srcdir: <repo>.git/<multi/part/branch>@<revision>"
-in="cbuild2.git/multi/part/branch@12345"
+in="abe.git/multi/part/branch@12345"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git~multi-part-branch@12345"; then
+if test x"${out}" = x"${local_snapshots}/abe.git~multi-part-branch@12345"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -162,9 +162,9 @@ else
 fi
 
 testing="get_srcdir: <repo>.git~<multi/part/branch>@<revision>"
-in="cbuild2.git~multi/part/branch@12345"
+in="abe.git~multi/part/branch@12345"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git~multi-part-branch@12345"; then
+if test x"${out}" = x"${local_snapshots}/abe.git~multi-part-branch@12345"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -174,7 +174,7 @@ fi
 
 # 
 testing="get_srcdir: invalid identifier shouldn't return anything."
-in="cbuild2~multi/part/branch@12345"
+in="abe~multi/part/branch@12345"
 out="`get_srcdir $in 2>/dev/null`"
 if test x"${out}" = x""; then
     pass "${testing}"
@@ -184,9 +184,9 @@ else
 fi
 
 testing="get_srcdir: <repo>~<multi/part/branch>@<revision>"
-in="git://git.linaro.org/people/rsavoye/cbuild2~multi/part/branch@12345"
+in="git://git.linaro.org/people/rsavoye/abe~multi/part/branch@12345"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2~multi-part-branch@12345"; then
+if test x"${out}" = x"${local_snapshots}/abe~multi-part-branch@12345"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -194,9 +194,9 @@ else
 fi
 
 testing="get_srcdir: <repo>.git~<multi/part/branch>@<revision>"
-in="cbuild2.git~multi/part/branch@12345"
+in="abe.git~multi/part/branch@12345"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git~multi-part-branch@12345"; then
+if test x"${out}" = x"${local_snapshots}/abe.git~multi-part-branch@12345"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -204,9 +204,9 @@ else
 fi
 
 testing="get_srcdir: http://<user>@<url>/<repo>.git"
-in="http://git@staging.git.linaro.org/git/toolchain/cbuild2.git"
+in="http://git@staging.git.linaro.org/git/toolchain/abe.git"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git"; then
+if test x"${out}" = x"${local_snapshots}/abe.git"; then
     pass "${testing}"
 else
     fail "${testing}"
@@ -214,9 +214,9 @@ else
 fi
 
 testing="get_srcdir: http://<user>@<url>/<repo>.git@<revision>"
-in="http://git@staging.git.linaro.org/git/toolchain/cbuild2.git@12345"
+in="http://git@staging.git.linaro.org/git/toolchain/abe.git@12345"
 out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cbuild2.git@12345"; then
+if test x"${out}" = x"${local_snapshots}/abe.git@12345"; then
     pass "${testing}"
 else
     fail "${testing}"
diff --git a/testsuite/test.sh b/testsuite/test.sh
index 6ea126c2..966323d7 100755
--- a/testsuite/test.sh
+++ b/testsuite/test.sh
@@ -2,7 +2,7 @@
 
 # common.sh loads all the files of library functions.
 if test x"`echo \`dirname "$0"\` | sed 's:^\./::'`" != x"testsuite"; then
-    echo "WARNING: Should be run from top cbuild2 dir" > /dev/stderr
+    echo "WARNING: Should be run from top abe dir" > /dev/stderr
     topdir="`readlink -e \`dirname $0\`/..`"
 else
     topdir=$PWD
@@ -17,7 +17,7 @@ else
     . "${topdir}/lib/common.sh" || exit 1
     warning "no host.conf file!  Synthesizing a framework for testing."
 
-    remote_snapshots=http://cbuild.validation.linaro.org/snapshots
+    remote_snapshots=http://abe.validation.linaro.org/snapshots
     wget_bin=/usr/bin/wget
     sources_conf=${topdir}/testsuite/test_sources.conf
 fi
@@ -28,13 +28,13 @@ wget_quiet=yes
 
 # We always override $local_snapshots so that we don't damage or move the
 # local_snapshots directory of an existing build.
-local_cbuild_tmp="`mktemp -d /tmp/cbuild2.$$.XXX`"
-local_snapshots="${local_cbuild_tmp}/snapshots"
+local_abe_tmp="`mktemp -d /tmp/abe.$$.XXX`"
+local_snapshots="${local_abe_tmp}/snapshots"
 
 # If this isn't being run in an existing build dir, create one in our
 # temp directory.
 if test ! -d "${local_builds}"; then
-    local_builds="${local_cbuild_tmp}/builds"
+    local_builds="${local_abe_tmp}/builds"
     out="`mkdir -p ${local_builds}`"
     if test "$?" -gt 1; then
 	error "Couldn't create local_builds dir ${local_builds}"
@@ -57,7 +57,7 @@ out="`mkdir -p ${local_snapshots}`"
 
 # Since we're testing, we don't load the host.conf file, instead
 # we create false values that stay consistent.
-cbuild_top=/build/cbuild2/test
+abe_top=/build/abe/test
 hostname=test.foobar.org
 target=x86_64-linux-gnu
 
@@ -135,7 +135,7 @@ totals()
 echo "============= get_toolname() tests ================"
 
 testing="get_toolname: uncompressed tarball"
-in="http://cbuild.validation.linaro.org/snapshots/gdb-7.6~20121001+git3e2e76a.tar"
+in="http://abe.validation.linaro.org/snapshots/gdb-7.6~20121001+git3e2e76a.tar"
 out="`get_toolname ${in}`"
 if test ${out} = "gdb"; then
     pass "${testing}"
@@ -146,7 +146,7 @@ fi
 
 # ----------------------------------------------------------------------------------
 testing="get_toolname: compressed tarball"
-in="http://cbuild.validation.linaro.org/snapshots/gcc-linaro-4.8-2013.06-1.tar.xz"
+in="http://abe.validation.linaro.org/snapshots/gcc-linaro-4.8-2013.06-1.tar.xz"
 out="`get_toolname ${in}`"
 if test ${out} = "gcc"; then
     pass "${testing}"
@@ -1249,8 +1249,8 @@ if test x"${out}" = x"gcc-linaro-4.8-${date}"; then
     xpass "${testing}"
 else
     # This fails because the tarball name fails to extract the version. This
-    # behavious isn't used by Cbuildv, it was an early feature to have some
-    # compatability with cbuildv1, which used tarballs. Cbuildv2 produces the
+    # behavious isn't used by Abe, it was an early feature to have some
+    # compatability with abev1, which used tarballs. Abe produces the
     # tarballs, it doesn't need to import them anymore.
     xfail "${testing}"
     fixme "create_release_tag returned ${out}"
@@ -1320,7 +1320,7 @@ test_checkout ()
 
 testing="checkout: http://git@<url>/<repo>.git"
 if test ! -e "${PWD}/host.conf"; then
-   package="cbuild2.git"
+   package="abe.git"
    branch=''
    revision=''
    should="pass"
@@ -1331,7 +1331,7 @@ fi
 
 testing="checkout: http://git@<url>/<repo>.git/<branch>"
 if test ! -e "${PWD}/host.conf"; then
-   package="cbuild2.git"
+   package="abe.git"
    branch="gerrit"
    revision=''
    should="pass"
@@ -1342,7 +1342,7 @@ fi
 
 testing="checkout: http://git@<url>/<repo>.git@<revision>"
 if test ! -e "${PWD}/host.conf"; then
-   package="cbuild2.git"
+   package="abe.git"
    branch=''
    revision="9bcced554dfc"
    should="pass"
@@ -1353,7 +1353,7 @@ fi
 
 testing="checkout: http://git@<url>/<repo>.git/unusedbranchnanme@<revision>"
 if test ! -e "${PWD}/host.conf"; then
-   package="cbuild2.git"
+   package="abe.git"
    branch="unusedbranchname"
    revision="9bcced554dfc"
    should="pass"
@@ -1364,7 +1364,7 @@ fi
 
 testing="checkout: http://git@<url>/<repo>.git/<nonexistentbranch> should fail."
 if test ! -e "${PWD}/host.conf"; then
-   package="cbuild2.git"
+   package="abe.git"
    branch="nonexistentbranch"
    revision=''
    should="fail"
@@ -1375,7 +1375,7 @@ fi
 
 testing="checkout: http://git@<url>/<repo>.git@<nonexistentrevision> should fail."
 if test ! -e "${PWD}/host.conf"; then
-   package="cbuild2.git"
+   package="abe.git"
    branch=''
    revision="123456bogusbranch"
    should="fail"
diff --git a/testsuite/test_sources.conf b/testsuite/test_sources.conf
index 11151850..7bd50c1c 100644
--- a/testsuite/test_sources.conf
+++ b/testsuite/test_sources.conf
@@ -14,7 +14,7 @@ gcc_tab.git	http://staging.git.linaro.org/git/toolchain/gcc.git
 binutils.git    git://git.linaro.org/toolchain/binutils.git
 libgloss.git    git://git.linaro.org/toolchain/newlib.git
 newlib.git      git://git.linaro.org/toolchain/newlib.git
-cbuild2.git     http://git@staging.git.linaro.org/git/toolchain/cbuild2.git
+abe.git     http://git@staging.git.linaro.org/git/toolchain/abe.git
 eglibc.git      git://git.linaro.org/toolchain/eglibc.git
 glibc.git       git://git.linaro.org/toolchain/glibc.git
 bitbake.git     git://git.openembedded.org/bitbake
diff --git a/validate.sh b/validate.sh
index dafc0540..909eed48 100755
--- a/validate.sh
+++ b/validate.sh
@@ -20,7 +20,7 @@
 if test -e "${PWD}/host.conf"; then
     . "${PWD}/host.conf"
 else
-    echo "Error: this script needs to be run from a configured Cbuild2 tree!" 1>&2
+    echo "Error: this script needs to be run from a configured Abe tree!" 1>&2
 fi
 
 if test $# -lt 4; then
@@ -40,9 +40,9 @@ target=$1
 shift
 
 # load commonly used functions
-cbuild="`which $0`"
-topdir="${cbuild_path}"
-cbuild2="`basename $0`"
+abe="`which $0`"
+topdir="${abe_path}"
+abe="`basename $0`"
 
 . "${topdir}/lib/diff.sh" || exit 1
 
@@ -51,7 +51,7 @@ declare -a revisions=($*)
 
 # Get the path for the other scripts.
 fullpath="`which $0`"
-cbuild2="`dirname ${fullpath}`/cbuild2.sh"
+abe="`dirname ${fullpath}`/abe.sh"
 tcwgweb="`dirname ${fullpath}`/tcwgweb.sh"
 
 # We'll move all the results to subdirectories under here
@@ -63,16 +63,16 @@ i=0
 while test $i -lt ${#revisions[@]}; do
     stamps="`ls -C1 ${local_builds}/${build}/${target}/*-stage2-build.stamp`"
     if test "`echo ${stamps} | grep -c ${revisions[$i]}`" -eq 0; then
-     	${cbuild2} --target ${target} --check gcc=gcc.git@${revisions[$i]} --build all
+     	${abe} --target ${target} --check gcc=gcc.git@${revisions[$i]} --build all
     fi
     sums="`find ${local_builds}/${build}/${target} -name \*.sum`"
     if test x"${sums}" != x; then
-	mkdir -p ${resultsdir}/cbuild${revisions[$i]}/${build}-${target}
-	cp ${sums} ${resultsdir}/cbuild${revisions[$i]}/${build}-${target}
+	mkdir -p ${resultsdir}/abe${revisions[$i]}/${build}-${target}
+	cp ${sums} ${resultsdir}/abe${revisions[$i]}/${build}-${target}
 	    # We don't need these files leftover from the DejaGnu testsuite
             # itself.
-	xz -f ${resultsdir}/cbuild${revisions[$i]}/${build}-${target}/*.sum
-	rm ${resultsdir}/cbuild${revisions[$i]}/${build}-${target}/{x,xXx,testrun}.sum
+	xz -f ${resultsdir}/abe${revisions[$i]}/${build}-${target}/*.sum
+	rm ${resultsdir}/abe${revisions[$i]}/${build}-${target}/{x,xXx,testrun}.sum
     fi
     i=`expr $i + 1`
 done
@@ -81,13 +81,13 @@ done
 # is a series, do them all in the order they were specified on the
 # command line.
 if test ${#revisions[@]} -eq 2; then
-    difftwodirs ${resultsdir}/cbuild${revisions[0]} ${resultsdir}/cbuild${revisions[1]}
+    difftwodirs ${resultsdir}/abe${revisions[0]} ${resultsdir}/abe${revisions[1]}
 else
     j=0
     while test $j -lt ${#revisions[@]}; do
-	first=cbuild${revisions[$j]}/${build}-${target}
+	first=abe${revisions[$j]}/${build}-${target}
 	j=`expr $j + 1`
-	second=cbuild${revisions[$j]}/${build}-${target}
+	second=abe${revisions[$j]}/${build}-${target}
 	if test x"${second}" = x; then
 	    break
 	else