aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Alcantara <pcacjr@zytor.com>2016-11-13 19:24:44 -0200
committerPaulo Alcantara <pcacjr@zytor.com>2016-11-13 19:30:37 -0200
commit63365b38ac466135e0e0c0685e88aa0c5eb4557e (patch)
tree0991b269e1b65f4fd756c3bb138d16a461c43729
parent852bd3fbca87640b061ebdf1cd9557a9c9a1547a (diff)
downloadsyslinux-weak-fixes.tar.gz
syslinux-weak-fixes.tar.xz
syslinux-weak-fixes.zip
extlinux: Fix loading of LDLINUXweak-fixes
The following commit broke the loading of ldlinux.c32 since the symbols which used to be weak were used on both non-networking and networking cores -- thus breaking linkage during module startup: commit 9acbffd33b9200ffe37833463b4d4478e824295a Author: H. Peter Anvin <hpa@linux.intel.com> Date: Wed Apr 6 12:15:37 2016 -0700 pxe_api.h: remove __weak from prototypes The prototypes themselves are not weak, and declaring them as such forces the core definitions, which should not be weak, as weak. This patch fixes it by providing weak stubs for all those symbols. Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
-rw-r--r--com32/elflink/ldlinux/readconfig.c6
-rw-r--r--com32/lib/syslinux/cleanup.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 3d6aa27e..4fac455f 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -37,6 +37,8 @@
#include "core.h"
#include "fs.h"
+extern __weak uint32_t SendCookies;
+
const struct menu_parameter mparm[NPARAMS] = {
[P_WIDTH] = {"width", 0},
[P_MARGIN] = {"margin", 10},
@@ -1569,3 +1571,7 @@ void parse_configs(char **argv)
m->onerror = unlabel(m->onerror);
}
}
+
+__weak void http_bake_cookies(void)
+{
+}
diff --git a/com32/lib/syslinux/cleanup.c b/com32/lib/syslinux/cleanup.c
index 7d8581e4..c9d089b5 100644
--- a/com32/lib/syslinux/cleanup.c
+++ b/com32/lib/syslinux/cleanup.c
@@ -38,3 +38,7 @@ void syslinux_final_cleanup(uint16_t flags)
cleanup_hardware();
}
+
+__weak void unload_pxe(uint16_t flags __attribute__((unsued)))
+{
+}