diff options
author | trav90 <travawine@protonmail.ch> | 2015-11-28 03:05:24 -0600 |
---|---|---|
committer | trav90 <travawine@protonmail.ch> | 2015-11-28 03:05:24 -0600 |
commit | 528a4b6c8e299538e8a8f5fe5dd47a864f8c2590 (patch) | |
tree | 661685e5d9eb3dec77f6b75789b27351387de8f4 /xpcom | |
parent | f8b224491a33c1fab69c2f144af5933f6ccced48 (diff) | |
download | palemoon-gre-528a4b6c8e299538e8a8f5fe5dd47a864f8c2590.tar.gz |
Remove old GCC version checks (Part 2)
Diffstat (limited to 'xpcom')
-rw-r--r-- | xpcom/glue/nsCOMPtr.h | 6 | ||||
-rw-r--r-- | xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp | 3 | ||||
-rw-r--r-- | xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_openbsd.cpp | 8 |
3 files changed, 4 insertions, 13 deletions
diff --git a/xpcom/glue/nsCOMPtr.h b/xpcom/glue/nsCOMPtr.h index d08292803..d36d1656d 100644 --- a/xpcom/glue/nsCOMPtr.h +++ b/xpcom/glue/nsCOMPtr.h @@ -81,10 +81,8 @@ #ifdef __GNUC__ // Our use of nsCOMPtr_base::mRawPtr violates the C++ standard's aliasing - // rules. Mark it with the may_alias attribute so that gcc 3.3 and higher - // don't reorder instructions based on aliasing assumptions for - // this variable. Fortunately, gcc versions < 3.3 do not do any - // optimizations that break nsCOMPtr. + // rules. Mark it with the may_alias attribute so that gcc doesn't reorder + // instructions based on aliasing assumptions for this variable. #define NS_MAY_ALIAS_PTR(t) t* __attribute__((__may_alias__)) #else diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp index d49c3c13e..e04b0c940 100644 --- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp @@ -14,8 +14,7 @@ #endif #if MOZ_IS_GCC -#if MOZ_GCC_VERSION_AT_LEAST(4, 5, 0) \ - && defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) && !defined(__ARM_PCS) +#if defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) && !defined(__ARM_PCS) #error "Can't identify floating point calling conventions.\nPlease ensure that your toolchain defines __ARM_PCS or __ARM_PCS_VFP." #endif #endif diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_openbsd.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_openbsd.cpp index 7eeb46b37..f6e1dc8fa 100644 --- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_openbsd.cpp +++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_openbsd.cpp @@ -9,15 +9,9 @@ #include "xptiprivate.h" #ifdef __GNUC__ -/* This tells gcc3.4+ not to optimize away symbols. - * @see http://gcc.gnu.org/gcc-3.4/changes.html +/* This tells gcc not to optimize away symbols. */ #define DONT_DROP_OR_WARN __attribute__((used)) -#else -/* This tells older gccs not to warn about unused vairables. - * @see http://docs.freebsd.org/info/gcc/gcc.info.Variable_Attributes.html - */ -#define DONT_DROP_OR_WARN __attribute__((unused)) #endif /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ |