Bug 546660 - Clean up mess around LINUX, AVMPLUS_LINUX, __linux__ (r+nnethercote) [kpalacz]
authorRick Reitmaier <rreitmai@adobe.com>
Thu, 04 Mar 2010 12:35:45 -0800
changeset 40243 74757beda82fabbfd7e1bafa9d47451b08c08642
parent 40242 065bbe536a935e14674fbc043066ad28fcc5ccf9
child 40244 9c2854a443594f1eea323f7398d9a763a29d72bd
push id12610
push userrsayre@mozilla.com
push dateMon, 05 Apr 2010 17:26:41 +0000
treeherdermozilla-central@1942c0b4e101 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs546660
milestone1.9.3a2pre
Bug 546660 - Clean up mess around LINUX, AVMPLUS_LINUX, __linux__ (r+nnethercote) [kpalacz] Gcc defines linux on linux, other compilers are supported to the extent that they emulate gcc's behavior
js/src/nanojit/CodeAlloc.cpp
--- a/js/src/nanojit/CodeAlloc.cpp
+++ b/js/src/nanojit/CodeAlloc.cpp
@@ -270,17 +270,18 @@ extern "C" void __clear_cache(char *BEG,
 #endif
 
 #if defined(AVMPLUS_UNIX) && defined(NANOJIT_MIPS)
 #include <asm/cachectl.h>
 extern  "C" int cacheflush(char *addr, int nbytes, int cache);
 #endif
 
 #ifdef AVMPLUS_SPARC
-#ifdef __linux__  // bugzilla 502369
+// Note: the linux #define provided by the compiler.
+#ifdef linux  // bugzilla 502369
 void sync_instruction_memory(caddr_t v, u_int len)
 {
     caddr_t end = v + len;
     caddr_t p = v;
     while (p < end) {
         asm("flush %0" : : "r" (p));
         p += 32;
     }