From c8f7614b98b5c8c516c4f779ce258147a23f1054 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 25 Nov 2013 05:53:20 +0100 Subject: [PATCH] * gentpl.py: Add -ed2016 in order to make objconv accept our binary. While it doesn't seem right solution, it works well enough and OSX isn't main compilation platform. --- ChangeLog | 6 ++++++ gentpl.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8c3ffe2db..cbeb01a3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-11-24 Vladimir Serbinenko + + * gentpl.py: Add -ed2016 in order to make objconv accept our binary. + While it doesn't seem right solution, it works well enough and + OSX isn't main compilation platform. + 2013-11-24 Vladimir Serbinenko * configure.ac: Add -static to LDFLAGS when using apple linker to diff --git a/gentpl.py b/gentpl.py index c8054803e..c135c5cea 100644 --- a/gentpl.py +++ b/gentpl.py @@ -432,7 +432,7 @@ def kernel(platform): else cp $< $@; fi""", """if test x$(TARGET_APPLE_LINKER) = x1; then \ $(TARGET_STRIP) -S -x $(""" + cname() + """) -o $@.bin $<; \ - $(TARGET_OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -wd1106 -nu -nd $@.bin $@; \ + $(TARGET_OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -ed2016 -wd1106 -nu -nd $@.bin $@; \ else """ + "$(TARGET_STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<; \ fi""")) return r