From ae495ca8fe9e48dea982cf522c5c54c56dffb9fd Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 8 May 2015 13:28:01 -0400 Subject: [PATCH] filesystems: we aren't BeOS, so we can safely use -O2(+). --- src/add-ons/kernel/file_systems/bfs/Jamfile | 5 ----- .../file_systems/udf/drive_setup_addon/Jamfile | 10 ---------- .../add-ons/kernel/file_systems/bfs/r5/Jamfile | 11 ----------- .../add-ons/kernel/file_systems/udf/r5/Jamfile | 13 ------------- .../file_systems/udf/r5/drive_setup_addon/Jamfile | 10 ---------- .../kernel/file_systems/userlandfs/bfs/Jamfile | 5 ----- src/tools/bfs_shell/Jamfile | 5 ----- 7 files changed, 59 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/Jamfile b/src/add-ons/kernel/file_systems/bfs/Jamfile index 8d78cf7bfd..b8842b9fab 100644 --- a/src/add-ons/kernel/file_systems/bfs/Jamfile +++ b/src/add-ons/kernel/file_systems/bfs/Jamfile @@ -7,11 +7,6 @@ SubDir HAIKU_TOP src add-ons kernel file_systems bfs ; #BFS_BIG_ENDIAN_ONLY ; - if $(DEBUG) = 0 { - # the gcc on BeOS doesn't compile BFS correctly with -O2 or more - OPTIM = -O1 ; - } - defines = [ FDefines $(defines) ] ; SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) ; 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..40fc156d84 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 @@ -1,8 +1,5 @@ SubDir HAIKU_TOP src add-ons kernel file_systems udf drive_setup_addon ; -# save original optimization level -oldOPTIM = $(OPTIM) ; - # set some additional defines { local defines = @@ -15,9 +12,6 @@ oldOPTIM = $(OPTIM) ; if $(DEBUG) { #defines += DEBUG ; - } else { - # the gcc on BeOS doesn't compile BFS correctly with -O2 or more - OPTIM = -O1 ; } defines = [ FDefines $(defines) ] ; @@ -55,7 +49,3 @@ actions ignore InstallUDFDS } InstallUDFDS install : i-udf-ds ; - -# restore original optimization level -OPTIM = $(oldOPTIM) ; - diff --git a/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile index 7a22934a15..882568e2ff 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile @@ -2,9 +2,6 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs r5 ; SetSubDirSupportedPlatformsBeOSCompatible ; -# save original optimization level -oldOPTIM = $(OPTIM) ; - # set some additional defines { local defines = @@ -27,11 +24,6 @@ oldOPTIM = $(OPTIM) ; bfsAddOnName = obfs ; } - if $(DEBUG) = 0 { - # the gcc on BeOS doesn't compile BFS correctly with -O2 or more - OPTIM = -O1 ; - } - defines = [ FDefines $(defines) ] ; SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) -fno-rtti ; @@ -75,6 +67,3 @@ actions ignore InstallBFS } InstallBFS install : obfs ; - -# restore original optimization level -OPTIM = $(oldOPTIM) ; diff --git a/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile index d94a504fa7..53c24abf51 100644 --- a/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile @@ -3,9 +3,6 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems udf r5 ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirC++Flags -fno-rtti ; -# save original optimization level -oldOPTIM = $(OPTIM) ; - # set some additional defines { local defines = @@ -14,11 +11,6 @@ oldOPTIM = $(OPTIM) ; defines += COMPILE_FOR_R5 ; - if $(DEBUG) = 0 { - # the gcc on BeOS doesn't compile BFS correctly with -O2 or more - OPTIM = -O1 ; - } - defines = [ FDefines $(defines) ] ; SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) ; @@ -62,8 +54,3 @@ actions ignore InstallUDF } InstallUDF install : udf ; - -# restore original optimization level -OPTIM = $(oldOPTIM) ; - -SubInclude HAIKU_TOP src tests add-ons kernel file_systems udf r5 drive_setup_addon ; diff --git a/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile index 8289920b43..e8829295c8 100644 --- a/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile @@ -2,9 +2,6 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems udf r5 drive_setup_addon SetSubDirSupportedPlatformsBeOSCompatible ; -# save original optimization level -oldOPTIM = $(OPTIM) ; - # set some additional defines { local defines = @@ -17,9 +14,6 @@ oldOPTIM = $(OPTIM) ; if $(DEBUG) { #defines += DEBUG ; - } else { - # the gcc on BeOS doesn't compile BFS correctly with -O2 or more - OPTIM = -O1 ; } defines = [ FDefines $(defines) ] ; @@ -57,7 +51,3 @@ actions ignore InstallUDFDS } InstallUDFDS install : i-udf-ds ; - -# restore original optimization level -OPTIM = $(oldOPTIM) ; - 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..28128f82c8 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile @@ -11,11 +11,6 @@ SEARCH_SOURCE += $(bfsTop) ; USER=1 ; - if $(DEBUG) = 0 { - # the gcc on BeOS doesn't compile BFS correctly with -O2 or more - OPTIM = -O1 ; - } - defines = [ FDefines $(defines) ] ; SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) -fno-rtti ; diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile index bd8fb28849..0c02396e7d 100644 --- a/src/tools/bfs_shell/Jamfile +++ b/src/tools/bfs_shell/Jamfile @@ -12,11 +12,6 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ; FS_SHELL ; - if $(DEBUG) = 0 { - # the gcc on BeOS doesn't compile BFS correctly with -O2 or more - OPTIM = -O1 ; - } - defines = [ FDefines $(defines) ] ; SubDirCcFlags $(defines) -Wno-multichar ; SubDirC++Flags $(defines) -Wno-multichar -fno-rtti ;