[haiku-commits] haiku: hrev49424 - in headers: private/kernel/util os

  • From: jerome.duval@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 20 Jul 2015 21:45:57 +0200 (CEST)

hrev49424 adds 1 changeset to branch 'master'
old head: bdd4f6b7d0958420796daaa7fcbd0c99f4076da2
new head: 94887feb6442669d41c72e998a0a4e57fee8cba1
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=94887feb6442+%5Ebdd4f6b7d095

----------------------------------------------------------------------------

94887feb6442: Added some support for GCC 5+.

[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision: hrev49424
Commit: 94887feb6442669d41c72e998a0a4e57fee8cba1
URL: http://cgit.haiku-os.org/haiku/commit/?id=94887feb6442
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Mon Jul 20 19:41:32 2015 UTC

----------------------------------------------------------------------------

3 files changed, 4 insertions(+), 4 deletions(-)
configure | 2 +-
headers/os/BeBuild.h | 2 +-
headers/private/kernel/util/AutoLock.h | 4 ++--

----------------------------------------------------------------------------

diff --git a/configure b/configure
index 6510989..1bedae3 100755
--- a/configure
+++ b/configure
@@ -823,7 +823,7 @@ else
get_build_tool_path STRIP_$targetArch
${crossToolsPrefix}strip

case `get_variable HAIKU_GCC_RAW_VERSION_$targetArch` in
- 4.*)
+ 4.*|5.*|6.*)
get_build_tool_path ELFEDIT_$targetArch
\
${crossToolsPrefix}elfedit
;;
diff --git a/headers/os/BeBuild.h b/headers/os/BeBuild.h
index 509ccf5..6eacecf 100644
--- a/headers/os/BeBuild.h
+++ b/headers/os/BeBuild.h
@@ -45,7 +45,7 @@

#if __GNUC__ == 2
# define B_HAIKU_ABI
B_HAIKU_ABI_GCC_2_HAIKU
-#elif __GNUC__ == 4
+#elif __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6
# define B_HAIKU_ABI
B_HAIKU_ABI_GCC_4
#else
# error Unsupported gcc version!
diff --git a/headers/private/kernel/util/AutoLock.h
b/headers/private/kernel/util/AutoLock.h
index 3151065..c081945 100644
--- a/headers/private/kernel/util/AutoLock.h
+++ b/headers/private/kernel/util/AutoLock.h
@@ -130,9 +130,9 @@ typedef AutoLocker<spinlock, SpinLocking> SpinLocker;

class InterruptsSpinLocking {
public:
-// NOTE: work-around for annoying GCC 4 "fState may be used uninitialized"
+// NOTE: work-around for annoying GCC 4+ "fState may be used uninitialized"
// warning.
-#if __GNUC__ == 4
+#if __GNUC__ >= 4
InterruptsSpinLocking()
:
fState(0)


Other related posts:

  • » [haiku-commits] haiku: hrev49424 - in headers: private/kernel/util os - jerome . duval