diff options
| author | Michael Brown | 2015-03-04 19:48:19 +0100 |
|---|---|---|
| committer | Michael Brown | 2015-03-05 01:59:38 +0100 |
| commit | fbc4ba4b4ed13cc86cb8fdea0bac6c3be0164ed5 (patch) | |
| tree | a0c504e297806aa88e89a04e694333a7c5172757 /src/tests | |
| parent | [build] Use REQUIRE_OBJECT() to drag in per-object configuration (diff) | |
| download | ipxe-fbc4ba4b4ed13cc86cb8fdea0bac6c3be0164ed5.tar.gz ipxe-fbc4ba4b4ed13cc86cb8fdea0bac6c3be0164ed5.tar.xz ipxe-fbc4ba4b4ed13cc86cb8fdea0bac6c3be0164ed5.zip | |
[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 <mcb30@ipxe.org>
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/cms_test.c | 1 | ||||
| -rw-r--r-- | src/tests/ocsp_test.c | 1 | ||||
| -rw-r--r-- | src/tests/tests.c | 1 | ||||
| -rw-r--r-- | src/tests/x509_test.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/tests/cms_test.c b/src/tests/cms_test.c index 8962e2ab..b805a997 100644 --- a/src/tests/cms_test.c +++ b/src/tests/cms_test.c @@ -1474,6 +1474,7 @@ struct self_test cms_test __self_test = { }; /* Drag in algorithms required for tests */ +REQUIRING_SYMBOL ( cms_test ); REQUIRE_OBJECT ( rsa ); REQUIRE_OBJECT ( md5 ); REQUIRE_OBJECT ( sha1 ); diff --git a/src/tests/ocsp_test.c b/src/tests/ocsp_test.c index a2f1f339..c6d45859 100644 --- a/src/tests/ocsp_test.c +++ b/src/tests/ocsp_test.c @@ -1861,5 +1861,6 @@ struct self_test ocsp_test __self_test = { }; /* Drag in algorithms required for tests */ +REQUIRING_SYMBOL ( ocsp_test ); REQUIRE_OBJECT ( rsa ); REQUIRE_OBJECT ( sha1 ); diff --git a/src/tests/tests.c b/src/tests/tests.c index a79ddfa0..adb90f20 100644 --- a/src/tests/tests.c +++ b/src/tests/tests.c @@ -30,6 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); */ /* Drag in all applicable self-tests */ +PROVIDE_REQUIRING_SYMBOL(); REQUIRE_OBJECT ( memset_test ); REQUIRE_OBJECT ( memcpy_test ); REQUIRE_OBJECT ( string_test ); diff --git a/src/tests/x509_test.c b/src/tests/x509_test.c index 67c8b39d..658d5247 100644 --- a/src/tests/x509_test.c +++ b/src/tests/x509_test.c @@ -1109,6 +1109,7 @@ struct self_test x509_test __self_test = { }; /* Drag in algorithms required for tests */ +REQUIRING_SYMBOL ( x509_test ); REQUIRE_OBJECT ( rsa ); REQUIRE_OBJECT ( sha1 ); REQUIRE_OBJECT ( sha256 ); |