i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch back from yasm to nasm

Browse Source 
These days, nasm supports more instructions than yasm. Additionally, it
offers a disassembler.
This commit is contained in:
Jonathan Schleifer
2014-03-28 23:10:24 +01:00
parent 3dc701c1c7
commit a04a520b0d
6 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+6 -6
View File
@@ -325,9 +325,9 @@ rule KernelArchitectureSetup architecture
# offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
# yasm is required for target arch x86
if ! $(HAIKU_YASM) {
Exit "HAIKU_YASM not set. Please re-run configure." ;
# nasm is required for target arch x86
if ! $(HAIKU_NASM) {
Exit "HAIKU_NASM not set. Please re-run configure." ;
}
case x86_64 :
@@ -340,9 +340,9 @@ rule KernelArchitectureSetup architecture
# x86_64 kernel source is under arch/x86.
HAIKU_KERNEL_ARCH = x86 ;
# yasm is required for target arch x86_64
if ! $(HAIKU_YASM) {
Exit "HAIKU_YASM not set. Please re-run configure." ;
# nasm is required for target arch x86_64
if ! $(HAIKU_NASM) {
Exit "HAIKU_NASM not set. Please re-run configure." ;
}
case m68k :
build/jam/OptionalPackages
+1 -1
View File
@@ -120,7 +120,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] {
}
# other commonly used tools
AddHaikuImagePackages bison cdrtools flex jam m4 make mkdepend yasm ;
AddHaikuImagePackages bison cdrtools flex jam m4 make mkdepend nasm ;
}