[haiku-commits] haiku: hrev46148 - build/jam src/system/boot/arch/m68k
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 30 Sep 2013 04:39:41 +0200 (CEST)
hrev46148 adds 2 changesets to branch 'master'
old head: 4046c49f886c1de0de9f17e208f9e445deb1e707
new head: 58c82e4fb72e2476c725d8a61617afc437dc5663
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=58c82e4+%5E4046c49
----------------------------------------------------------------------------
68bccdf: M68K: More gcc options fixes
58c82e4: Make sure the boot driver tgz doesn't overflow the boot floppy
At least on 68k it does. Seems to be ok on x86, for now...
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 12 insertions(+), 3 deletions(-)
build/jam/ImageRules | 9 +++++++++
src/system/boot/arch/m68k/Jamfile | 6 +++---
############################################################################
Commit: 68bccdf6b4415005532c1c2639a9a4eea23a4c43
URL: http://cgit.haiku-os.org/haiku/commit/?id=68bccdf
Author: François Revol <revol@xxxxxxx>
Date: Mon Sep 30 02:21:41 2013 UTC
M68K: More gcc options fixes
----------------------------------------------------------------------------
diff --git a/src/system/boot/arch/m68k/Jamfile
b/src/system/boot/arch/m68k/Jamfile
index 26e9d2a..4e3359b 100644
--- a/src/system/boot/arch/m68k/Jamfile
+++ b/src/system/boot/arch/m68k/Jamfile
@@ -23,17 +23,17 @@ BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
BootMergeObject boot_arch_m68k_030.o :
mmu_030.cpp
- : -fno-pic -Wno-unused -m68030
+ : -fno-pic -Wno-unused -mcpu=68030
;
BootMergeObject boot_arch_m68k_040.o :
mmu_040.cpp
- : -fno-pic -Wno-unused -m68040
+ : -fno-pic -Wno-unused -mcpu=68040 -Wa,-m68040
;
BootMergeObject boot_arch_m68k_060.o :
mmu_060.cpp
- : -fno-pic -Wno-unused -m68060
+ : -fno-pic -Wno-unused -mcpu=68060
;
SEARCH on [ FGristFiles arch_elf.cpp ]
############################################################################
Revision: hrev46148
Commit: 58c82e4fb72e2476c725d8a61617afc437dc5663
URL: http://cgit.haiku-os.org/haiku/commit/?id=58c82e4
Author: François Revol <revol@xxxxxxx>
Date: Mon Sep 30 02:38:50 2013 UTC
Make sure the boot driver tgz doesn't overflow the boot floppy
At least on 68k it does. Seems to be ok on x86, for now...
----------------------------------------------------------------------------
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 9589468..28c5f7f 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1506,17 +1506,26 @@ rule BuildFloppyBootImage image : haikuLoader : archive
actions BuildFloppyBootImage1
{
haiku_loader_size=`stat -c %s "$(>[1])"`
+ drivers_tgz_size=`stat -c %s "$(>[2])"`
if [ $? -ne 0 ] ; then
# FreeBSD's stat command don't support -c/--format option
# and use %z specifier for file size
haiku_loader_size=`stat -f %z "$(>[1])"`
+ drivers_tgz_size=`stat -f %z "$(>[2])"`
fi
archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
+ floppy_tgz_size=\
+ `echo "($(FLOPPY_IMAGE_SIZE) - $(ARCHIVE_IMAGE_OFFSET)) * 1024"
| bc`
if [ $haiku_loader_size -gt $archive_image_offset ] ; then
echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit "
echo " before the boot archive starting at
$archive_image_offset!"
exit 1
fi
+ if [ $drivers_tgz_size -gt $floppy_tgz_size ] ; then
+ echo "Error: $(>[2]) is too big ($drivers_tgz_size) to fit "
+ echo " in the boot floppy ($floppy_tgz_size)!"
+ exit 1
+ fi
$(RM) $(<)
# make an empty image
dd if=/dev/zero of=$(<) bs=1k count=$(FLOPPY_IMAGE_SIZE)
Other related posts:
- » [haiku-commits] haiku: hrev46148 - build/jam src/system/boot/arch/m68k - revol
