Re: [PATCH 0/4] objtool: Improve code generation for annotation macros

Ingo Molnar
2025-12-03T15:59:49Z

* Peter Zijlstra <peterz@infradead.org> wrote:

> On Tue, Nov 25, 2025 at 10:06:56PM -0800, Josh Poimboeuf wrote:
> > For tip/objtool/core.
> >
> > As much as possible, undo the code generation damage introduced by
> > ANNOTATE_DATA_SPECIAL:
> >
> > - Remove its usage in favor of SHF_MERGE + sh_entsize, where possible
> >
> > - Print the annotation on a single line:
> >
> > 912: .pushsection ".discard.annotate_data", "M", @progbits, 8; .long 912b - .; .long 1; .popsection
> >
> > - Remove the trailing newline/tab; let the invoking code decide on the
> > appropriate separator for the given context
> >
> > Josh Poimboeuf (4):
> > x86/alternative: Remove ANNOTATE_DATA_SPECIAL usage
> > x86/asm: Remove ANNOTATE_DATA_SPECIAL usage
> > objtool: Consolidate annotation macros
> > objtool: Remove newlines and tabs from annotation macros
>
> Durr, this will conflict with tip/core/bugs. Let me ponder this a bit.

So Josh has resolved these conflicts based on latest -git
which has all these moving pieces integrated into a single
tree, so I've applied these fixes to tip:objtool/urgent.

Thanks,

Ingo