Make eglibc default. The gcc.conf file shouldn't set the clibrary.

The clibrary should be set in cbuild2.sh so that it can be overridden
and the values compared against expectations.  This includes automatic
setting of newlib for baremetal targets.

Change-Id: Ifb468099162a6e48a43d82a82d5204d11348604a

1 files changed, 46 insertions, 6 deletions

diff --git a/test.sh b/test.sh
index 591a5207..c9a1a80c 100755
--- a/test.sh
+++ b/test.sh
@@ -278,12 +278,6 @@ cb_commands="--dryrun --target arm-none-linux-gnueabihf --checkout all"
 match=''
 test_pass "${cb_commands}" "${match}"
 
-libc="glibc"
-target="aarch64-none-elf"
-cb_commands="--target ${target} --set libc=${libc}"
-match="crosscheck_clibrary_target"
-test_failure "${cb_commands}" "${match}"
-
 cb_commands="--set=libc=glibc"
 match="A space is expected"
 test_failure "${cb_commands}" "${match}"
@@ -325,6 +319,52 @@ match=''
 test_pass "${cb_commands}" "${match}"
 
 target="aarch64-none-elf"
+# A baremetal target should pick the right clibrary (newlib)
+cb_commands="--target ${target} --dump"
+match='newlib'
+test_pass "${cb_commands}" "${match}"
+
+target="armeb-none-linux-gnueabihf"
+# A baremetal target should pick the right clibrary (newlib)
+cb_commands="--target ${target} --dump"
+match='eglibc'
+test_pass "${cb_commands}" "${match}"
+
+target="armeb-linux-gnueabihf"
+# A baremetal target should pick the right clibrary (newlib)
+cb_commands="--target ${target} --dump"
+match='eglibc'
+test_pass "${cb_commands}" "${match}"
+
+target="armeb-none-linux-gnueabi"
+cb_commands="--target ${target} --dump"
+match='eglibc'
+test_pass "${cb_commands}" "${match}"
+
+target="armeb-linux-gnueabi"
+cb_commands="--target ${target} --dump"
+match='eglibc'
+test_pass "${cb_commands}" "${match}"
+
+target="armeb-none-linux-gnueabi"
+# A baremetal target should pick the right clibrary (newlib)
+cb_commands="--target ${target} --dump"
+match='eglibc'
+test_pass "${cb_commands}" "${match}"
+
+target="armeb-none-eabi"
+# A baremetal target should pick the right clibrary (newlib)
+cb_commands="--target ${target} --dump"
+match='newlib'
+test_pass "${cb_commands}" "${match}"
+
+target="arm-none-eabi"
+# A baremetal target should pick the right clibrary (newlib)
+cb_commands="--target ${target} --dump"
+match='newlib'
+test_pass "${cb_commands}" "${match}"
+
+target="aarch64-none-elf"
 libc="newlib"
 cb_commands="--target ${target} --set libc=${libc}"
 match=''