Merge branch 'master' into XSSFilt

5 files changed, 1 insertions, 11 deletions

diff --git a/xpcom/base/nsError.h b/xpcom/base/nsError.h
index fa89a8102..3dffa6d67 100644
--- a/xpcom/base/nsError.h
+++ b/xpcom/base/nsError.h
@@ -141,8 +141,7 @@
   } nsresult;
 #elif defined(__cplusplus)
   /*
-   * We're C++ in an old compiler lacking enum classes *and* typed enums (likely
-   * gcc < 4.5.1 as clang/MSVC have long supported one or both), or compiler
+   * We're C++ in an old compiler lacking enum classes *and* typed enums, or compiler
    * support is unknown.  Yet nsresult must have unsigned 32-bit representation.
    * So just make it a typedef, and implement the constants with global consts.
    */
diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
index f125d527d..1a087c70c 100644
--- a/xpcom/glue/SSE.cpp
+++ b/xpcom/glue/SSE.cpp
@@ -16,7 +16,6 @@ namespace {
 
 #ifdef HAVE_CPUID_H
 
-// cpuid.h is available on gcc 4.3 and higher on i386 and x86_64
 #include <cpuid.h>
 
 enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 };
diff --git a/xpcom/glue/SSE.h b/xpcom/glue/SSE.h
index 15a064c6b..ec45013e2 100644
--- a/xpcom/glue/SSE.h
+++ b/xpcom/glue/SSE.h
@@ -40,12 +40,6 @@
  *     ...
  *   }
  *
- * Note that these functions depend on cpuid intrinsics only available in gcc
- * 4.3 or later and MSVC 8.0 (Visual C++ 2005) or later, so they return false
- * in older compilers.  (This could be fixed by replacing the code with inline
- * assembly.)
- *
- *
  * USING INTRINSICS
  * ================
  *
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_openbsd.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_openbsd.cpp
index d4315c395..f5d17a7b5 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_openbsd.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_openbsd.cpp
@@ -124,7 +124,6 @@ PrepareAndDispatch(nsXPTCStubBase * self, uint32_t methodIndex,
     return result;
 }
 
-// Linux/x86-64 uses gcc >= 3.1
 #define STUB_ENTRY(n) \
 asm(".section	\".text\"\n\t" \
     ".align	2\n\t" \
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
index 113eb54a4..5a00dfc32 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
@@ -127,7 +127,6 @@ PrepareAndDispatch(nsXPTCStubBase * self, uint32_t methodIndex,
     return result;
 }
 
-// Linux/x86-64 uses gcc >= 3.1
 #define STUB_ENTRY(n) \
 asm(".section	\".text\"\n\t" \
     ".align	2\n\t" \