At the example of _sinitext - that symbol has four aliases on x86:
__init_begin, __2M_init_start, __2M_rodata_end, and whatever the first
function in .init.text. With the GNU toolchain all of them are marked
'T' or 't'. With Clang/LLVM, however, some are marked 'r'. Since, to
save space, we want fake "end" symbols only for text, right now
want_symbol_end() has a respective check. That is getting in the way,
however, when the final of those symbols is 'r'. Remove the check and
instead zap the size for anything that is non-code.
Fixes: 6eede548df21 ('symbols: avoid emitting "end" symbols for data items')
Signed-off-by: Jan Beulich <[email protected]>
---
Roger, just fyi that I think that this change would mask the other issue
that you reported, without actually adressing the underlying problem.
Hence both changes will be wanted.
--- a/xen/tools/symbols.c
+++ b/xen/tools/symbols.c
@@ -164,6 +164,10 @@ static int read_symbol(FILE *in, struct
else if (str[0] == '$')
goto skip_tail;
+ /* We want fake "end" symbols only for text / code. */
+ if (toupper((uint8_t)stype) != 'T')
+ s->size = 0;
+
/* include the type field in the symbol name, so that it gets
* compressed together */
s->len = strlen(str) + 1;
@@ -312,7 +316,6 @@ static int compare_name_orig(const void
static bool want_symbol_end(unsigned int idx)
{
return table[idx].size &&
- toupper(table[idx].type) == 'T' &&
(idx + 1 == table_cnt ||
table[idx].addr + table[idx].size < table[idx + 1].addr);
}
