[haiku-commits] haiku: hrev53470 - in src: tools/bfs_shell tests/add-ons/kernel/file_systems/userlandfs/bfs tests/add-ons/kernel/file_systems/udf/udf_shell tests/add-ons/kernel/file_systems/iso9660/iso9660_shell add-ons/kernel/file_systems/bfs

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 9 Sep 2019 20:41:47 -0400 (EDT)

hrev53470 adds 1 changeset to branch 'master'
old head: 194a45c6b4183083afdc7fac7b9e85f9162cdeb2
new head: 4ee6978ed7cb22beae0d47c16839220d40a3f8c2
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=4ee6978ed7cb+%5E194a45c6b418

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

4ee6978ed7cb: BFS: Only compile with -O1 under GCC2.
  
  GCC7+ does not have whatever compiler bugs plague GCC2, so we can
  use -O2 there as usual.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

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

Revision:    hrev53470
Commit:      4ee6978ed7cb22beae0d47c16839220d40a3f8c2
URL:         https://git.haiku-os.org/haiku/commit/?id=4ee6978ed7cb
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Tue Sep 10 00:30:47 2019 UTC

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

6 files changed, 11 insertions(+), 13 deletions(-)
src/add-ons/kernel/file_systems/bfs/JamCommon                     | 4 ++--
src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile     | 4 +---
.../add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile     | 4 ++--
src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile       | 4 ++--
src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile      | 4 ++--
src/tools/bfs_shell/Jamfile                                       | 4 ++--

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

diff --git a/src/add-ons/kernel/file_systems/bfs/JamCommon 
b/src/add-ons/kernel/file_systems/bfs/JamCommon
index 78b4d83b1d..b0cc99de3f 100644
--- a/src/add-ons/kernel/file_systems/bfs/JamCommon
+++ b/src/add-ons/kernel/file_systems/bfs/JamCommon
@@ -12,8 +12,8 @@
                SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
        }
 
-       if $(DEBUG) = 0 {
-               # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+       if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+               # GCC2 doesn't compile BFS correctly with -O2 or more
                OPTIM = -O1 ;
        }
 
diff --git a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile 
b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
index 329a3ab981..23e546dcee 100644
--- a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
@@ -13,9 +13,7 @@ oldOPTIM = $(OPTIM) ;
                defines += COMPILE_FOR_R5 ;
        }
 
-       if $(DEBUG) {
-               #defines += DEBUG ;
-       } else {
+       if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
                # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
                OPTIM = -O1 ;
        }
diff --git 
a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile 
b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
index a2e8a14973..16ed05e809 100644
--- a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
@@ -12,8 +12,8 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
                FS_SHELL
                ;
 
-       if $(DEBUG) = 0 {
-               # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+       if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+               # GCC2 doesn't compile BFS correctly with -O2 or more
                OPTIM = -O1 ;
        }
 
diff --git a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile 
b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
index 017264b7cb..53edbd46f8 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
@@ -11,8 +11,8 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
                FS_SHELL
                ;
 
-       if $(DEBUG) = 0 {
-               # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+       if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+               # GCC2 doesn't compile BFS correctly with -O2 or more
                OPTIM = -O1 ;
        }
 
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile 
b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
index b42a2d0349..a63b15cec4 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
@@ -11,8 +11,8 @@ SEARCH_SOURCE += $(bfsTop) ;
                USER=1
        ;
 
-       if $(DEBUG) = 0 {
-               # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+       if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+               # GCC2 doesn't compile BFS correctly with -O2 or more
                OPTIM = -O1 ;
        }
 
diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile
index 67cb11ed32..0fa6788d95 100644
--- a/src/tools/bfs_shell/Jamfile
+++ b/src/tools/bfs_shell/Jamfile
@@ -12,8 +12,8 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
                FS_SHELL
                ;
 
-       if $(DEBUG) = 0 {
-               # the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+       if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+               # GCC2 doesn't compile BFS correctly with -O2 or more
                OPTIM = -O1 ;
        }
 


Other related posts: