Use -mtls-use-call in newlib build.

tools/Makefile

 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 ##############################################################################
 # Helper script for NaCl toolchain development workflow.
 #
 # Buildbots:
 # - Sync needed sources at pinned revision and build newlib-based toolchain:
 #     make buildbot-build-with-newlib TOOLCHAINLOC=<where-to-install-the-toolchain>
@@ skipping 432 matching lines @@
             $(PREGCC_PREFIX)/$(CROSSARCH)/lib/libcrt_platform.a
         touch $@
 
 
 ##################################################################
 # newlib:
 # Builds the bare-bones library used by NativeClient applications.
 # NOTE: removes the default pthread.h to enable correct install
 # by the Native Client threads package build.
 ##################################################################
+
+NEWLIB_CFLAGS = -O2 -D_I386MACH_ALLOW_HW_INTERRUPTS -mtls-use-call
+
 BUILD/stamp-$(CROSSARCH)-newlib: | SRC/newlib BUILD
         rm -rf BUILD/build-newlib-$(CROSSARCH)
         mkdir BUILD/build-newlib-$(CROSSARCH)
         ../src/trusted/service_runtime/export_header.py ../src/trusted/service_runtime/include \
                 SRC/newlib/newlib/libc/sys/nacl
-        if [ "x$(CROSSARCH)" = "xnacl64" ] ; then \
-          cd BUILD/build-newlib-$(CROSSARCH) && \
-            PATH=$(BUILDPATH) \
-                  CFLAGS="-O2" \
-              ../../SRC/newlib/configure \
-                          --disable-libgloss \
-                          --enable-newlib-iconv \
-                          --enable-newlib-io-long-long \
-                          --enable-newlib-io-long-double \
-                          --enable-newlib-io-c99-formats \
-                          --enable-newlib-mb \
-                --prefix=$(SDKROOT) \
-                --target=$(CROSSARCH) && \
-          cd ../.. ; \
-          PATH=$(BUILDPATH) \
-            $(MAKE) -C BUILD/build-newlib-$(CROSSARCH) \
-                            CCASFLAGS="-D_I386MACH_ALLOW_HW_INTERRUPTS" \
-                    CFLAGS_FOR_TARGET="-m64 -O2" \
-                  CXXFLAGS_FOR_TARGET="-m64 -O2" \
-              all ; \
-        else \
-          cd BUILD/build-newlib-$(CROSSARCH) && \
-            PATH=$(BUILDPATH) \
-                  CFLAGS="-O2" \
-              ../../SRC/newlib/configure \
-                          --disable-libgloss \
-                          --enable-newlib-iconv \
-                          --enable-newlib-io-long-long \
-                          --enable-newlib-io-long-double \
-                          --enable-newlib-io-c99-formats \
-                          --enable-newlib-mb \
-                --prefix=$(SDKROOT) \
-                --target=$(CROSSARCH) ; \
-          cd ../.. ; \
-          PATH=$(BUILDPATH) \
-            $(MAKE) -C BUILD/build-newlib-$(CROSSARCH) \
-                    CFLAGS_FOR_TARGET="-m32 -O2" \
-                  CXXFLAGS_FOR_TARGET="-m32 -O2" \
-              all ; \
-        fi
-        PATH=$(BUILDPATH) \
-          $(MAKE) -C BUILD/build-newlib-$(CROSSARCH) \
-            DESTDIR=$(DESTDIR) install
+        PATH=$(BUILDPATH); \

[Mark Seaborn, 2011/04/11 22:57:32]

"&&" instead of ";"?  (This could fail if $(BUILDPATH) contains a space.)  If
you make this change, the next line should be indented by 2 for consistency.

Maybe "export PATH=..." instead of "PATH=..." - again, just in case.

+        cd BUILD/build-newlib-$(CROSSARCH) && \
+          ../../SRC/newlib/configure \
+                      --disable-libgloss \
+                      --enable-newlib-iconv \
+                      --enable-newlib-io-long-long \
+                      --enable-newlib-io-long-double \
+                      --enable-newlib-io-c99-formats \
+                      --enable-newlib-mb \
+            --prefix=$(SDKROOT) \
+            CFLAGS='-O2' \
+            CFLAGS_FOR_TARGET='$(NEWLIB_CFLAGS)' \
+            CXXFLAGS_FOR_TARGET='$(NEWLIB_CFLAGS)' \
+            --target=$(CROSSARCH) && \
+          $(MAKE) && \
+          $(MAKE) DESTDIR=$(DESTDIR) install
         rm $(DESTDIR)$(SDKROOT)/$(CROSSARCH)/include/pthread.h
         touch $@
 
 .PHONY: newlib
 newlib: BUILD/stamp-$(CROSSARCH)-newlib
 
 
 ##################################################################
 # glibc:
 ##################################################################
@@ skipping 531 matching lines @@
 ##################################################################
 # Remove the BUILD directory.
 # Library builds are maintained by scons.
 ##################################################################
 
 .PHONY: clean
 clean:
         rm -rf BUILD
 
 .PHONY: ALWAYS