Closed Bug 510451 Opened 13 years ago Closed 13 years ago

Build failed on solaris after merge tamarin's CodeAlloc(bug 504462).

Categories

(Core :: JavaScript Engine, defect)

x86
Solaris
defect
Not set
normal

Tracking

()

RESOLVED FIXED
Tracking Status
status1.9.2 --- beta1-fixed

People

(Reporter: leon.sha, Assigned: leon.sha)

Details

Attachments

(1 file)

Build failed on solaris after merge tamarin's CodeAlloc.


"./nanojit/avmplus.h", line 111: Warning: The variable x has not yet been assigned a value.
"./nanojit/../vprof/vprof.h", line 174: Warning: declarator required in declaration.
"./nanojit/../vprof/vprof.h", line 213: Error: "," expected instead of "i64var".
"./nanojit/../vprof/vprof.h", line 214: Error: Use ";" to terminate declarations.
"./nanojit/../vprof/vprof.h", line 214: Error: "," expected instead of "dvar".
"./nanojit/../vprof/vprof.h", line 217: Error: Use ";" to terminate declarations.
4 Error(s) and 2 Warning(s) detected.
gmake[1]: *** [CodeAlloc.o] Error 4


"./nanojit/avmplus.h", line 111: Warning: The variable x has not yet been assigned a value.
"./nanojit/avmplus.cpp", line 169: Error: Formal argument 1 of type char* in call to munmap(char*, unsigned) is being passed void*.
1 Error(s) and 1 Warning(s) detected.
Assignee: general → leon.sha
Status: NEW → ASSIGNED
Attachment #394481 - Flags: review?(gal)
Attachment #394481 - Flags: review?(gal) → review+
Comment on attachment 394481 [details] [diff] [review]
Patch got from tamarin-redux.

>diff --git a/js/src/nanojit/avmplus.cpp b/js/src/nanojit/avmplus.cpp
>--- a/js/src/nanojit/avmplus.cpp
>+++ b/js/src/nanojit/avmplus.cpp
>@@ -161,17 +161,17 @@ nanojit::CodeAlloc::allocCodeChunk(size_
>                 PROT_READ | PROT_WRITE | PROT_EXEC,
>                 MAP_PRIVATE | MAP_ANON,
>                 -1,
>                 0);
> }
> 
> void
> nanojit::CodeAlloc::freeCodeChunk(void *p, size_t nbytes) {
>-    munmap(p, nbytes);
>+    munmap((maddr_ptr)p, nbytes);
> }
> 
> #else // !WIN32 && !AVMPLUS_UNIX
> 
> void*
> nanojit::CodeAlloc::allocCodeChunk(size_t nbytes) {
>     return valloc(nbytes);
> }
>diff --git a/js/src/vprof/vprof.h b/js/src/vprof/vprof.h
>--- a/js/src/vprof/vprof.h
>+++ b/js/src/vprof/vprof.h
>@@ -98,16 +98,18 @@ typedef unsigned __int64   uint64_t;
> #include <inttypes.h>
> #endif
> 
> // portable align macro
> #if defined(_MSC_VER)
> 	#define vprof_align8(t) __declspec(align(8)) t
> #elif defined(__GNUC__)
> 	#define vprof_align8(t) t __attribute__ ((aligned (8)))
>+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
>+	#define vprof_align8(t) t __attribute__ ((aligned (8)))

I would merge this with the GNUC line above.

> #endif
> 
> #ifdef __cplusplus
> extern "C" {
> #endif
> 
> int profileValue (void** id, char* file, int line, int64_t value, ...);
> int _profileEntryValue (void* id, int64_t value);
http://hg.mozilla.org/tracemonkey/rev/7b6fbcb0fd97
http://hg.mozilla.org/mozilla-central/rev/fd7ac9bc9029
Status: ASSIGNED → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.