diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 392b0249f3d..3af6259c7f1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/29987
+	* config/sparc/sol2.h (ASM_OUTPUT_ALIGNED_COMMON): Redefine.
+
 2008-11-29  David Edelsohn  <edelsohn@gnu.org>
 
 	* config/rs6000/rs6000.c (rs6000_emit_sync): Remove support for
diff --git a/gcc/config/sparc/sol2.h b/gcc/config/sparc/sol2.h
index a31a2e33ad8..139f5b39dff 100644
--- a/gcc/config/sparc/sol2.h
+++ b/gcc/config/sparc/sol2.h
@@ -176,3 +176,21 @@ along with GCC; see the file COPYING3.  If not see
       fprintf (FILE, "\n\tnop\n");				\
     }								\
   while (0)
+
+/* Solaris 'as' has a bug: a .common directive in .tbss section
+   behaves as .tls_common rather than normal non-TLS .common.  */
+#undef  ASM_OUTPUT_ALIGNED_COMMON
+#define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN)		\
+  do									\
+    {									\
+      if (TARGET_SUN_TLS						\
+	  && in_section							\
+	  && ((in_section->common.flags & (SECTION_TLS | SECTION_BSS))	\
+	      == (SECTION_TLS | SECTION_BSS)))				\
+	switch_to_section (bss_section);				\
+      fprintf ((FILE), "%s", COMMON_ASM_OP);				\
+      assemble_name ((FILE), (NAME));					\
+      fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n",		\
+	       (SIZE), (ALIGN) / BITS_PER_UNIT);			\
+    }									\
+  while (0)