[syslinux:firmware] ldlinux: Fix recent pxe symbol regression

syslinux-bot for Matt Fleming matt.fleming at intel.com
Wed Dec 11 02:09:08 PST 2013

Commit-ID:  c9eaf27f6198b97ee546cfe4f2a0efd550e533ef
Gitweb:     http://www.syslinux.org/commit/c9eaf27f6198b97ee546cfe4f2a0efd550e533ef
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Wed, 11 Dec 2013 09:47:32 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Wed, 11 Dec 2013 09:47:32 +0000

ldlinux: Fix recent pxe symbol regression

commit 60dabb5b1d6d ("pxe: Make the SENDCOOKIES feature for HTTP worked
again") introduced a regression for ldlinux because it references the
'SendCookies' symbol, which is only provided by PXELINUX.

The regression was caused because the '__weak' tag was dropped from the
declaration of SendCookies.

Tested-by: "Santillanes, Russel" <Russel.Santillanes at gs.com>
Signed-off-by: Matt Fleming <matt.fleming at intel.com>

 com32/include/syslinux/pxe_api.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com32/include/syslinux/pxe_api.h b/com32/include/syslinux/pxe_api.h
index f8c3c10..3e994c0 100644
--- a/com32/include/syslinux/pxe_api.h
+++ b/com32/include/syslinux/pxe_api.h
@@ -589,7 +589,7 @@ int __weak pxe_call(int, void *);
 void __weak unload_pxe(uint16_t flags);
 uint32_t __weak dns_resolv(const char *);
-extern uint32_t SendCookies;
+extern uint32_t __weak SendCookies;
 void __weak http_bake_cookies(void);
 #endif /* _SYSLINUX_PXE_API_H */

More information about the Syslinux-commits mailing list