Commit c2d42079 authored by Josh Poimboeuf's avatar Josh Poimboeuf
Browse files

elfnote: Change ELFNOTE() to use __UNIQUE_ID() 



In preparation for the objtool klp diff subcommand, replace the custom
unique symbol name generation in ELFNOTE() with __UNIQUE_ID().

This standardizes the naming format for all "unique" symbols, which will
allow objtool to properly correlate them.  Note this also removes the
"one ELF note per line" limitation.

Acked-by: default avatarPetr Mladek <pmladek@suse.com>
Tested-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
parent 9f14f1f9

include/linux/elfnote.h

+5 −8
Original line number Diff line number Diff line
@@ -60,23 +60,21 @@ 


#else	/* !__ASSEMBLER__ */

#include <uapi/linux/elf.h>

#include <linux/compiler.h>

/*

 * Use an anonymous structure which matches the shape of

 * Elf{32,64}_Nhdr, but includes the name and desc data.  The size and

 * type of name and desc depend on the macro arguments.  "name" must

 * be a literal string, and "desc" must be passed by value.  You may

 * only define one note per line, since __LINE__ is used to generate

 * unique symbols.

 * be a literal string, and "desc" must be passed by value.

 */

#define _ELFNOTE_PASTE(a,b)	a##b

#define _ELFNOTE(size, name, unique, type, desc)			\

#define ELFNOTE(size, name, type, desc)					\

	static const struct {						\

		struct elf##size##_note _nhdr;				\

		unsigned char _name[sizeof(name)]			\

		__attribute__((aligned(sizeof(Elf##size##_Word))));	\

		typeof(desc) _desc					\

			     __attribute__((aligned(sizeof(Elf##size##_Word)))); \

	} _ELFNOTE_PASTE(_note_, unique)				\

	} __UNIQUE_ID(note)						\

		__used							\

		__attribute__((section(".note." name),			\

			       aligned(sizeof(Elf##size##_Word)),	\
@@ -89,11 +87,10 @@ 
		name,							\

		desc							\

	}

#define ELFNOTE(size, name, type, desc)		\

	_ELFNOTE(size, name, __LINE__, type, desc)



#define ELFNOTE32(name, type, desc) ELFNOTE(32, name, type, desc)

#define ELFNOTE64(name, type, desc) ELFNOTE(64, name, type, desc)



#endif	/* __ASSEMBLER__ */



#endif /* _LINUX_ELFNOTE_H */