[haiku-commits] Change in haiku[master]: m68k: make sure boot & kernel code can run on 020-060

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 5 Feb 2020 15:31:16 +0000

From François Revol <revol@xxxxxxx>:

François Revol has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/2221 ;)


Change subject: m68k: make sure boot & kernel code can run on 020-060
......................................................................

m68k: make sure boot & kernel code can run on 020-060

Change-Id: I5830085fcd6120600ff3be85a2fdd2602e1935fe
---
M build/jam/ArchitectureRules
1 file changed, 7 insertions(+), 2 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/21/2221/1

diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 12994e3..9e3b521 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -447,8 +447,8 @@
                case m68k :
                        # We don't want to have to handle emulating missing FPU 
opcodes for
                        # 040 and 060 in the kernel.
-                       HAIKU_KERNEL_CCFLAGS += -mtune=68020-60 ;
-                       HAIKU_KERNEL_C++FLAGS += -mtune=68020-60 ;
+                       HAIKU_KERNEL_CCFLAGS += -m68020-60 ;
+                       HAIKU_KERNEL_C++FLAGS += -m68020-60 ;
                        HAIKU_DEFINES_$(architecture) += _GLIBCXX_HAVE_FENV_H ;
                        HAIKU_KERNEL_DEFINES += _GLIBCXX_HAVE_FENV_H ;

@@ -538,6 +538,11 @@
                                # all other bootloaders are non-PIC
                                HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic 
-Wno-error=main ;
                                HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -fno-pic 
-Wno-error=main ;
+                               switch $(cpu) {
+                                       case m68k :
+                                               
HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -m68020-60 ;
+                                               
HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -m68020-60 ;
+                               }
                }
        }


--
To view, visit https://review.haiku-os.org/c/haiku/+/2221
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I5830085fcd6120600ff3be85a2fdd2602e1935fe
Gerrit-Change-Number: 2221
Gerrit-PatchSet: 1
Gerrit-Owner: François Revol <revol@xxxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: m68k: make sure boot & kernel code can run on 020-060 - Gerrit