Merge "Update TOOLCHAIN_GIT_DATE & misc fixes"

build/tools/build-host-gcc.sh

@@ -721,7 +721,7 @@ select_toolchain_for_host ()
                         dump ""
                         exit 1
                     fi
-                    local DARWINMINVER=$(darwin_arch_to_version_min $2)
+                    local DARWINMINVER=$(darwin_arch_to_min_version $2)
                     check_darwin_sdk $DARWIN_SYSROOT $DARWINARCH
                     try_host_prefix "$DARWIN_TOOLCHAIN" -m$(tag_to_bits $1) --sysroot "$DARWIN_SYSROOT"
                     if [ -z "$HOST_FULLPREFIX" ]; then

build/tools/dev-defaults.sh

@@ -23,7 +23,7 @@ GNUSTL_SUBDIR=sources/cxx-stl/gnu-libstdc++
 
 # The date to use when downloading toolchain sources from AOSP servers
 # Leave it empty for tip of tree.
-TOOLCHAIN_GIT_DATE=2012-05-17
+TOOLCHAIN_GIT_DATE=2012-06-10
 
 # The space-separated list of all GCC versions we support in this NDK
 DEFAULT_GCC_VERSION_LIST="4.4.3"

build/tools/dev-rebuild-ndk.sh

@@ -33,7 +33,7 @@ PROGDIR=`cd $PROGDIR && pwd`
 
 
 # Name of this NDK release
-OPTION_NDK_RELEASE="r6x-eng"
+OPTION_NDK_RELEASE=`date +%Y%m%d`
 register_var_option "--release=<rel_name>" OPTION_NDK_RELEASE "Version of release"
 
 # Should we only Build for Linux platform?

build/tools/toolchain-patches/binutils/0001-Fix-ld-gc-sections.patch

+diff --git a/binutils-2.21/bfd/elflink.c b/binutils-2.21/bfd/elflink.c
+index 51dae66..753bb9c 100644
+--- a/binutils-2.21/bfd/elflink.c
++++ b/binutils-2.21/bfd/elflink.c
+@@ -11575,6 +11575,9 @@ struct elf_gc_sweep_symbol_info
+ static bfd_boolean
+ elf_gc_sweep_symbol (struct elf_link_hash_entry *h, void *data)
+ {
++  if (h->root.type == bfd_link_hash_warning)
++    h = (struct elf_link_hash_entry *) h->root.u.i.link;
++
+   if (!h->mark
+       && (((h->root.type == bfd_link_hash_defined
+             || h->root.type == bfd_link_hash_defweak)

build/tools/toolchain-patches/build/0001-Options-brought-in-from-core-combo-for-IA.patch

@@ -11,7 +11,7 @@ diff --git a/Makefile.in b/Makefile.in
 index 0b73ff6..c7b5847 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -434,6 +434,35 @@ GCC_CONFIG_ARGS += $(GCC_CONFIG_LIBSTDCXX_V3) --disable-libssp \
+@@ -441,6 +441,35 @@ GCC_CONFIG_ARGS += $(GCC_CONFIG_LIBSTDCXX_V3) --disable-libssp \
  	--disable-tls --disable-libitm
  
  CFLAGS_FOR_TARGET += -DTARGET_POSIX_IO -fno-short-enums

docs/ANDROID-MK.html

@@ -620,7 +620,7 @@ LOCAL_DISABLE_NO_EXECUTE
 
 LOCAL_DISABLE_RELRO
     By default, NDK compiled code is built with read-only relocations
-    and GOT protection.  This instruct the runtime linker to mark
+    and GOT protection.  This instructs the runtime linker to mark
     certain regions of memory as being read-only after relocation,
     making certain security exploits (such as GOT overwrites) harder
     to perform.