569145 - bustage on FreeBSD (in js/src/jsnativestack.cpp)

Status: VERIFIED FIXED

(Core :: JavaScript Engine, defect)

Description

[Marco Perez [:mpk]]

Attachment: unbreak FreeBSD builds in jsnativestack.cpp (mozilla-central)

+++ This bug was initially created as a clone of Bug #567937 +++

On FreeBSD builds have been broken in js/src/jsnativestack.cpp since the fix
for bug 237006 landed.
Part of the problem is that the necessary definitions/declarations are not
in pthread.h but in pthread_np.h (non-portable) instead. FreeBSD also defines
_PTHREAD_NP_H_ (in /usr/include/pthread_np.h) instead of PTHREAD_NP_H. These
entries seem to be part of the base system since 4.8-RELEASE (according to the
online manpages at http://www.freebsd.org/cgi/man.cgi).

Using the attached patch I was able to build without any problems.

Comment 1

[Igor Bukanov]

Comment on attachment 448283 [details] [diff] [review]
unbreak FreeBSD builds in jsnativestack.cpp (mozilla-central)

>diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
>--- a/js/src/jsnativestack.cpp
>+++ b/js/src/jsnativestack.cpp
>@@ -46,16 +46,20 @@
> #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
> # include <pthread.h>
> 
> #else
> # error "Unsupported platform"
> 
> #endif
> 
>+#if defined(__FreeBSD__)
>+# include <pthread_np.h>
>+#endif
>+

Nit: move this ifdef into the above elif defined(XP_MACOSX) part right after include <pthread.h>. 

Marco, can you land this at hg.mozilla.org/tracemonkey ?

Comment 2

[Marco Perez [:mpk]]

Attachment: patch v2 (mozilla-central or tracemonkey)

Igor, unfortunately I don't have write access.

Comment 3

[Marco Perez [:mpk]]

Comment on attachment 448290 [details] [diff] [review]
patch v2 (mozilla-central or tracemonkey)

Ooops, I just discovered that the tracemonkey version of the file differs
slightly from the one in mozilla central. If you want I can generate a
corrected patch for tracemonkey.

Comment 4

[Igor Bukanov]

http://hg.mozilla.org/tracemonkey/rev/af9499c6d1f3

Comment 5

[Robert Sayre]

http://hg.mozilla.org/mozilla-central/rev/af9499c6d1f3