[haiku-commits] haiku: hrev47781 - in src/system/boot: platform/u-boot loader
- From: ithamar@xxxxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 31 Aug 2014 01:44:17 +0200 (CEST)
hrev47781 adds 2 changesets to branch 'master'
old head: 6e48c81badfeb1e939beb75d59f2dd862263d166
new head: 780ca2bd158bacffe8fac40f15c8ce1788e3c041
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=780ca2b+%5E6e48c81
----------------------------------------------------------------------------
ad5bdbd: ELF: enlarge the allowed padding between sections
Turns out the padding on ARM is slightly larger, and prevented
the kernel add-ons from being loaded.
780ca2b: ARM: abort() is already pulled in using kernel_util.o
It was just here to make libgcc happy.
[ Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 1 insertion(+), 9 deletions(-)
src/system/boot/loader/elf.cpp | 2 +-
src/system/boot/platform/u-boot/start.cpp | 8 --------
############################################################################
Commit: ad5bdbdfd451c10975db51e141af4cc33f295de7
URL: http://cgit.haiku-os.org/haiku/commit/?id=ad5bdbd
Author: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
Date: Sat Aug 30 23:34:30 2014 UTC
ELF: enlarge the allowed padding between sections
Turns out the padding on ARM is slightly larger, and prevented
the kernel add-ons from being loaded.
----------------------------------------------------------------------------
diff --git a/src/system/boot/loader/elf.cpp b/src/system/boot/loader/elf.cpp
index 7616e89..7479463 100644
--- a/src/system/boot/loader/elf.cpp
+++ b/src/system/boot/loader/elf.cpp
@@ -275,7 +275,7 @@ ELFLoader<Class>::Load(int fd, preloaded_image* _image)
// inbetween.
totalSize = secondRegion->start + secondRegion->size -
firstRegion->start;
if (totalSize > image->text_region.size + image->data_region.size
- + 8 * 1024) {
+ + 16 * 1024) {
status = B_BAD_DATA;
goto error1;
}
############################################################################
Revision: hrev47781
Commit: 780ca2bd158bacffe8fac40f15c8ce1788e3c041
URL: http://cgit.haiku-os.org/haiku/commit/?id=780ca2b
Author: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
Date: Sat Aug 30 23:37:02 2014 UTC
ARM: abort() is already pulled in using kernel_util.o
It was just here to make libgcc happy.
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/start.cpp
b/src/system/boot/platform/u-boot/start.cpp
index fd1e951..0a2fb10 100644
--- a/src/system/boot/platform/u-boot/start.cpp
+++ b/src/system/boot/platform/u-boot/start.cpp
@@ -87,14 +87,6 @@ call_ctors(void)
}
-/* needed for libgcc unwind XXX */
-extern "C" void
-abort(void)
-{
- panic("abort");
-}
-
-
extern "C" void
platform_start_kernel(void)
{
Other related posts:
- » [haiku-commits] haiku: hrev47781 - in src/system/boot: platform/u-boot loader - ithamar
