Don't recommend or require -none- for a linux target.

Change-Id: I5db1621c31aa6aab6a1f40a8b320cd2abbd6ff5e

4 files changed, 46 insertions, 44 deletions

diff --git a/README b/README
index c070c373..90b6a457 100644
--- a/README
+++ b/README
@@ -104,32 +104,32 @@ string. To build a specific component, use the --build option to
 abe. the --target option is also used for cross builds. For
 example:
 
-"abe.sh --target arm-none-linux-gnueabihf gcc-linaro-4.8.2013.07-1"
+"abe.sh --target arm-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:
 
-"abe.sh --target arm-none-linux-gnueabihf git://git.linaro.org/toolchain/eglibc.git"
+"abe.sh --target arm-linux-gnueabihf git://git.linaro.org/toolchain/eglibc.git"
 
 To build an entire cross toolchain, the simplest way is to let
 abe control all the steps. Although it is also possible to do each
 step separately. To build the full toolchain, do this:
 
-"abe.sh --target arm-none-linux-gnueabihf --build all"
+"abe.sh --target arm-linux-gnueabihf --build all"
 
 ---------------------------------------------------------------------
 Older NOTES
 
-x86_64-none-linux-gnu
-arm-none-linux-gnueabi
-arm-none-linux-gnueabihf
-armeb-none-linux-gnueabihf
-aarch64-none-linux-gnu
+x86_64-linux-gnu
+arm-linux-gnueabi
+arm-linux-gnueabihf
+armeb-linux-gnueabihf
+aarch64-linux-gnu
 aarch64-none-elf
 aarch64_be-none-elf
-aarch64_be-none-linux-gnu
+aarch64_be-linux-gnu
 
 Toolchain Components
  * gcc (gcc, g++, objc, fortran)
diff --git a/abe.sh b/abe.sh
index 1518a007..caf24176 100755
--- a/abe.sh
+++ b/abe.sh
@@ -301,14 +301,16 @@ OPTIONS
                  
 		<target_triple>
 
-			x86_64-none-linux-gnu
-			arm-none-linux-gnueabi
-			arm-none-linux-gnueabihf
-			armeb-none-linux-gnueabihf
-			aarch64-none-linux-gnu
+			x86_64-linux-gnu
+			arm-linux-gnueabi
+			arm-linux-gnueabihf
+			arm-none-eabi
+			armeb-none-eabi
+			armeb-linux-gnueabihf
+			aarch64-linux-gnu
 			aarch64-none-elf
 			aarch64_be-none-elf
-			aarch64_be-none-linux-gnu
+			aarch64_be-linux-gnu
 
 			If <target_triple> is not the same as the hardware
 			that ${abe} is running on then build the
@@ -346,11 +348,11 @@ EXAMPLES
 
   Build a Linux cross toolchain:
 
-    ${abe} --target arm-none-linux-gnueabihf --build all
+    ${abe} --target arm-linux-gnueabihf --build all
 
   Build a Linux cross toolchain with glibc as the clibrary:
 
-    ${abe} --target arm-none-linux-gnueabihf --set libc=glibc --build all
+    ${abe} --target arm-linux-gnueabihf --set libc=glibc --build all
 
   Build a bare metal toolchain:
 
diff --git a/config/gcc.conf b/config/gcc.conf
index 457d9b66..1457e3c7 100644
--- a/config/gcc.conf
+++ b/config/gcc.conf
@@ -208,7 +208,7 @@ else
 	default_configure_flags="${default_configure_flags} --disable-bootstrap"
     fi
     case ${target} in
-	arm*-none-linux-gnueabi)
+	arm*-linux-gnueabi)
 	    if test x"${override_arch}" = x -a x"${override_cpu}" = x; then
 	        default_configure_flags="${default_configure_flags} --with-arch=armv7-a"
 	    fi
diff --git a/test.sh b/test.sh
index 242a859d..694270aa 100755
--- a/test.sh
+++ b/test.sh
@@ -224,13 +224,13 @@ test_config_default()
   # Let's make sure the stage is actually skipped.
   # --force makes sure we run through to the stage even
   # if the builddir builds stamps are new.
-  cb_commands="--dryrun --force --target arm-none-linux-gnueabihf --disable ${feature} --build all"
+  cb_commands="--dryrun --force --target arm-linux-gnueabihf --disable ${feature} --build all"
   test_pass "${cb_commands}" "${skip_match}"
 
   # Let's make sure the stage is actually NOT skipped.
   # --force makes sure we run through to the stage even
   # if the builddir builds stamps are new.
-  cb_commands="--dryrun --force --target arm-none-linux-gnueabihf --enable ${feature} --build all"
+  cb_commands="--dryrun --force --target arm-linux-gnueabihf --enable ${feature} --build all"
   test_pass "${cb_commands}" "${perform_match}"
 }
 
@@ -351,15 +351,15 @@ cb_commands="--dryrun --checkout gcc.git"
 match=''
 test_pass "${cb_commands}" "${match}"
 
-cb_commands="--dryrun --target arm-none-linux-gnueabihf --checkout glibc.git"
+cb_commands="--dryrun --target arm-linux-gnueabihf --checkout glibc.git"
 match=''
 test_pass "${cb_commands}" "${match}"
 
-cb_commands="--dryrun --target arm-none-linux-gnueabihf --checkout=glibc.git"
+cb_commands="--dryrun --target arm-linux-gnueabihf --checkout=glibc.git"
 match="A space is expected"
 test_failure "${cb_commands}" "${match}"
 
-cb_commands="--dryrun --target arm-none-linux-gnueabihf --checkout all"
+cb_commands="--dryrun --target arm-linux-gnueabihf --checkout all"
 match=''
 test_pass "${cb_commands}" "${match}"
 
@@ -409,7 +409,7 @@ cb_commands="--target ${target} --dump"
 match='newlib'
 test_pass "${cb_commands}" "${match}"
 
-target="armeb-none-linux-gnueabihf"
+target="armeb-linux-gnueabihf"
 # A baremetal target should pick the right clibrary (newlib)
 cb_commands="--target ${target} --dump"
 match='eglibc'
@@ -421,7 +421,7 @@ cb_commands="--target ${target} --dump"
 match='eglibc'
 test_pass "${cb_commands}" "${match}"
 
-target="armeb-none-linux-gnueabi"
+target="armeb-linux-gnueabi"
 cb_commands="--target ${target} --dump"
 match='eglibc'
 test_pass "${cb_commands}" "${match}"
@@ -431,7 +431,7 @@ cb_commands="--target ${target} --dump"
 match='eglibc'
 test_pass "${cb_commands}" "${match}"
 
-target="armeb-none-linux-gnueabi"
+target="armeb-linux-gnueabi"
 # A baremetal target should pick the right clibrary (newlib)
 cb_commands="--target ${target} --dump"
 match='eglibc'
@@ -508,13 +508,13 @@ match="Couldn't find the source for"
 test_failure "${cb_commands}" "${match}"
 
 # This tests that --build can go before --target and --target is still processed correctly.
-cb_commands="--dryrun --build all --target arm-none-linux-gnueabihf --dump"
-match='arm-none-linux-gnueabihf'
+cb_commands="--dryrun --build all --target arm-linux-gnueabihf --dump"
+match='arm-linux-gnueabihf'
 test_pass "${cb_commands}" "${match}"
 
 # This tests that --checkout can go before --target and --target is still processed correctly.
-cb_commands="--dryrun --checkout all --target arm-none-linux-gnueabihf --dump"
-match='arm-none-linux-gnueabihf'
+cb_commands="--dryrun --checkout all --target arm-linux-gnueabihf --dump"
+match='arm-linux-gnueabihf'
 test_pass "${cb_commands}" "${match}"
 
 test_config_default make_docs 'Make Documentation' 'Skipping make docs'    'Making docs in'
@@ -556,7 +556,7 @@ match='Target is\:         arm-linux-gnueabihf'
 test_pass "${cb_commands}" "${match}"
 
 # This tests that --checkout and --build can be run together.
-cb_commands="--dryrun --target arm-none-linux-gnueabihf --checkout all --build all"
+cb_commands="--dryrun --target arm-linux-gnueabihf --checkout all --build all"
 match=''
 test_pass "${cb_commands}" "${match}"
 
@@ -626,7 +626,7 @@ match="crosscheck_clibrary_target"
 test_failure "${cb_commands}" "${match}"
 
 # The same as previous but with other commands mixed in.
-target="arm-none-linux-gnueabihf"
+target="arm-linux-gnueabihf"
 cb_commands="--set libc=glibc --dry-run --build all --target ${target}"
 match=''
 test_pass "${cb_commands}" "${match}"
@@ -643,50 +643,50 @@ else
 fi
 
 cb_commands="--dry-run --target arm-linux-gnueabihf --set arch=armv8-a"
-march='Overriding default --with-arch to armv8-a'
+match='Overriding default --with-arch to armv8-a'
 test_pass "${cb_commands}" "${match}"
 
 cb_commands="--dry-run --target arm-linux-gnueabihf --set cpu=cortex-a57"
-march='Overriding default --with-cpu to cortex-a57'
+match='Overriding default --with-cpu to cortex-a57'
 test_pass "${cb_commands}" "${match}"
 
 cb_commands="--dry-run --target arm-linux-gnueabihf --set tune=cortex-a53"
-march='Overriding default --with-cpu to cortex-a53'
+match='Overriding default --with-tune to cortex-a53'
 test_pass "${cb_commands}" "${match}"
 
-cb_commands="--dry-run --target arm-none-linux-gnueabihf --check=foo"
+cb_commands="--dry-run --target arm-linux-gnueabihf --check=foo"
 match='is invalid after'
 test_failure "${cb_commands}" "${match}"
 
-cb_commands="--dry-run --target arm-none-linux-gnueabihf --dump --check"
+cb_commands="--dry-run --target arm-linux-gnueabihf --dump --check"
 match='check              all'
 test_pass "${cb_commands}" "${match}"
 
-cb_commands="--dry-run --target arm-none-linux-gnueabihf --dump --check --dump"
+cb_commands="--dry-run --target arm-linux-gnueabihf --dump --check --dump"
 match='check              all'
 test_pass "${cb_commands}" "${match}"
 
 # Yes this won't work because we match on 'exact' package name only.
-cb_commands="--dry-run --target arm-none-linux-gnueabihf --dump --check gdb--dump"
+cb_commands="--dry-run --target arm-linux-gnueabihf --dump --check gdb--dump"
 match='dump is an invalid package'
 test_failure "${cb_commands}" "${match}"
 
-cb_commands="--dry-run --target arm-none-linux-gnueabihf --check --dump"
+cb_commands="--dry-run --target arm-linux-gnueabihf --check --dump"
 match='check              all'
 test_pass "${cb_commands}" "${match}"
 
-cb_commands="--dry-run --target arm-none-linux-gnueabihf --check gdb --dump"
+cb_commands="--dry-run --target arm-linux-gnueabihf --check gdb --dump"
 match='check              gdb'
 test_pass "${cb_commands}" "${match}"
 
-cb_commands="--dry-run --target arm-none-linux-gnueabihf --check all --dump"
+cb_commands="--dry-run --target arm-linux-gnueabihf --check all --dump"
 match='check              all'
 test_pass "${cb_commands}" "${match}"
 
 # Verify that --check without a directive doesn't strip the next switch from
 # the command line.
-cb_commands="--dry-run --check --target arm-none-linux-gnueabihf --dump"
-match='         arm-none-linux-gnueabihf'
+cb_commands="--dry-run --check --target arm-linux-gnueabihf --dump"
+match='         arm-linux-gnueabihf'
 test_pass "${cb_commands}" "${match}"
 
 # test various combinations of --check and --excludecheck