--- a/config/system-headers
+++ b/config/system-headers
@@ -641,18 +641,20 @@ share.h
 shellapi.h
 shlguid.h
 shlobj.h
 sigcontext.h
 signal.h
 SimpleGameSound.h
 SIOUX.h
 size_t.h
+sndio.h
 someincludefile.h
 Sound.h
+soundcard.h
 sqlite3.h
 ssdef.h
 sslerr.h
 ssl.h
 sslproto.h
 sstream
 stack
 StandardFile.h

--- a/configure.in
+++ b/configure.in
@@ -3616,23 +3616,27 @@ AC_CACHE_CHECK(for __thread keyword for 
                             ac_cv_thread_keyword=yes,
                             ac_cv_thread_keyword=no)])
 LDFLAGS=$_SAVE_LDFLAGS
 # The custom dynamic linker doesn't support TLS variables
 MOZ_TLS=
 if test "$ac_cv_thread_keyword" = yes -a "$MOZ_LINKER" != 1; then
   # mips builds fail with TLS variables because of a binutils bug.
   # See bug 528687
+  # OpenBSD doesn't have TLS support, and the test succeeds with clang++
   case "${target}" in
     mips*-*)
       :
       ;;
     *-android*|*-linuxandroid*)
       :
       ;;
+    *-openbsd*)
+      :
+      ;;
     *)
       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
       MOZ_TLS=1
       ;;
   esac
 fi
 
 dnl Using the custom linker on ARMv6 requires 16k alignment of ELF segments.

--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -641,18 +641,20 @@ share.h
 shellapi.h
 shlguid.h
 shlobj.h
 sigcontext.h
 signal.h
 SimpleGameSound.h
 SIOUX.h
 size_t.h
+sndio.h
 someincludefile.h
 Sound.h
+soundcard.h
 sqlite3.h
 ssdef.h
 sslerr.h
 ssl.h
 sslproto.h
 sstream
 stack
 StandardFile.h