From fbc4ba4b4ed13cc86cb8fdea0bac6c3be0164ed5 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 4 Mar 2015 18:48:19 +0000 Subject: [build] Fix the REQUIRE_SYMBOL mechanism At some point in the past few years, binutils became more aggressive at removing unused symbols. To function as a symbol requirement, a relocation record must now be in a section marked with @progbits and must not be in a section which gets discarded during the link (either via --gc-sections or via /DISCARD/). Update REQUIRE_SYMBOL() to generate relocation records meeting these criteria. To minimise the impact upon the final binary size, we use existing symbols (specified via the REQUIRING_SYMBOL() macro) as the relocation targets where possible. We use R_386_NONE or R_X86_64_NONE relocation types to prevent any actual unwanted relocation taking place. Where no suitable symbol exists for REQUIRING_SYMBOL() (such as in config.c), the macro PROVIDE_REQUIRING_SYMBOL() can be used to generate a one-byte-long symbol to act as the relocation target. If there are versions of binutils for which this approach fails, then the fallback will probably involve killing off REQUEST_SYMBOL(), redefining REQUIRE_SYMBOL() to use the current definition of REQUEST_SYMBOL(), and postprocessing the linked ELF file with something along the lines of "nm -u | wc -l" to check that there are no undefined symbols remaining. Signed-off-by: Michael Brown --- src/drivers/bus/usb.c | 3 +++ src/drivers/net/rtl818x/rtl8180.c | 1 + src/drivers/net/rtl818x/rtl8185.c | 1 + src/drivers/net/vxge/vxge.c | 1 + 4 files changed, 6 insertions(+) (limited to 'src/drivers') diff --git a/src/drivers/bus/usb.c b/src/drivers/bus/usb.c index 91d52b0cc..22a57e6e5 100644 --- a/src/drivers/bus/usb.c +++ b/src/drivers/bus/usb.c @@ -1903,6 +1903,9 @@ struct usb_port * usb_root_hub_port ( struct usb_device *usb ) { return usb->port; } +/* Drag in objects via register_usb_bus() */ +REQUIRING_SYMBOL ( register_usb_bus ); + /* Drag in USB configuration */ REQUIRE_OBJECT ( config_usb ); diff --git a/src/drivers/net/rtl818x/rtl8180.c b/src/drivers/net/rtl818x/rtl8180.c index 8851d1bfb..0c7d0775f 100644 --- a/src/drivers/net/rtl818x/rtl8180.c +++ b/src/drivers/net/rtl818x/rtl8180.c @@ -4,6 +4,7 @@ FILE_LICENCE(GPL2_OR_LATER); #include +PROVIDE_REQUIRING_SYMBOL(); REQUIRE_OBJECT(rtl818x); REQUIRE_OBJECT(rtl8180_grf5101); REQUIRE_OBJECT(rtl8180_max2820); diff --git a/src/drivers/net/rtl818x/rtl8185.c b/src/drivers/net/rtl818x/rtl8185.c index fd27e5c8c..438c5f24b 100644 --- a/src/drivers/net/rtl818x/rtl8185.c +++ b/src/drivers/net/rtl818x/rtl8185.c @@ -4,6 +4,7 @@ FILE_LICENCE(GPL2_OR_LATER); #include +PROVIDE_REQUIRING_SYMBOL(); REQUIRE_OBJECT(rtl818x); REQUIRE_OBJECT(rtl8185_rtl8225); diff --git a/src/drivers/net/vxge/vxge.c b/src/drivers/net/vxge/vxge.c index bf20ec43c..9c587722b 100644 --- a/src/drivers/net/vxge/vxge.c +++ b/src/drivers/net/vxge/vxge.c @@ -9,6 +9,7 @@ FILE_LICENCE(GPL2_OR_LATER); #include +PROVIDE_REQUIRING_SYMBOL(); REQUIRE_OBJECT(vxge_main); /** vxge PCI IDs for util/parserom.pl which are put into bin/NIC */ -- cgit v1.2.3-55-g7522