--- a/components/gcc3/Makefile	Tue Dec 06 15:40:36 2016 -0800
+++ b/components/gcc3/Makefile	Tue Dec 06 16:01:32 2016 -0800
@@ -85,6 +85,9 @@
 CONFIGURE_OPTIONS.sparc +=	--without-gnu-as --with-as=$(USRBINDIR)/as
 CONFIGURE_OPTIONS.i386 +=	--with-gnu-as --with-as=$(GNUBIN)/as
 
+COMPONENT_BUILD_ENV +=	gcc_cv_as_ix86_gotoff_in_data=yes
+COMPONENT_BUILD_ENV +=	gcc_cv_as_tls=yes
+
 COMPONENT_BUILD_ENV += STAGE1_CFLAGS="$(CFLAGS)"
 COMPONENT_BUILD_ENV += CFLAGS_FOR_TARGET="$(CFLAGS)"
 COMPONENT_BUILD_ENV += SHELL=$(CONFIG_SHELL)

--- a/components/gcc4/Makefile	Tue Dec 06 15:40:36 2016 -0800
+++ b/components/gcc4/Makefile	Tue Dec 06 16:01:32 2016 -0800
@@ -101,6 +101,7 @@
 CONFIGURE_OPTIONS +=	--with-mpfr-include=$(USRINCDIR)/mpfr
 CONFIGURE_OPTIONS +=	--without-gnu-ld --with-ld=$(USRBINDIR)/ld
 CONFIGURE_OPTIONS +=	--with-gnu-as --with-as=$(GNUBIN)/as
+CONFIGURE_OPTIONS +=	--enable-tls
 
 # If the compiler used to build matches the compiler being built, there is no
 # need for a 3 stage build.