Merge commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75' into HEAD
diff --git a/envsetup.sh b/envsetup.sh
index 4fa74e6..a38f20a 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1,13 +1,3 @@
-# These unsets should stay to clear the old functions from any long running
-# shells.
-# TODO(danalbert): Remove this in a day or so.
-unset -f gdbwrapper
-unset -f get_symbols_directory
-unset -f adb_get_product_device
-unset -f adb_get_traced_by
-unset -f gdbclient
-unset -f gdbclient_old
-
function hmm() {
cat <<EOF
Invoke ". build/envsetup.sh" from your shell to add the following functions to your environment:
diff --git a/target/board/generic_armv5/BoardConfig.mk b/target/board/generic_armv5/BoardConfig.mk
index 95fb559..016937a 100644
--- a/target/board/generic_armv5/BoardConfig.mk
+++ b/target/board/generic_armv5/BoardConfig.mk
@@ -19,6 +19,5 @@
TARGET_ARCH_VARIANT := armv5te
TARGET_CPU_ABI := armeabi
TARGET_CPU_ABI2 :=
-ARCH_ARM_HAVE_TLS_REGISTER := false
WITH_DEXPREOPT := false