aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2014-06-09 15:04:04 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2014-06-09 15:04:04 -0700
commit415d571ea785c86167301056c6eff744f3cec615 (patch)
treed07c02d11f324a0759bdee1629560d2adff0bb9e
parent05409a52ff0eb26618745d7da3c1c917061a2140 (diff)
downloadsyslinux-415d571ea785c86167301056c6eff744f3cec615.tar.gz
syslinux-415d571ea785c86167301056c6eff744f3cec615.tar.xz
syslinux-415d571ea785c86167301056c6eff744f3cec615.zip
adv: Remove double defintion
__syslinux_adv_* symbols are now part of the core, so don't export them again elsewhere. This broke all uses of the ADV, including --once. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--com32/elflink/ldlinux/adv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/com32/elflink/ldlinux/adv.c b/com32/elflink/ldlinux/adv.c
index 677fe92d..0cbbe274 100644
--- a/com32/elflink/ldlinux/adv.c
+++ b/com32/elflink/ldlinux/adv.c
@@ -34,9 +34,7 @@
#include <syslinux/adv.h>
#include <syslinux/firmware.h>
#include <klibc/compiler.h>
-
-__export void *__syslinux_adv_ptr;
-__export size_t __syslinux_adv_size;
+#include <syslinux/adv.h>
void __constructor __syslinux_init(void)
{