projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'master-2012-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[deliverable/linux.git]
/
include
/
linux
/
elfnote.h
diff --git
a/include/linux/elfnote.h
b/include/linux/elfnote.h
index 9a1e0674e56ce6760d5088718d468981687f3c08..278e3ef0533699f2e9a3845bdc12715ce6be30cb 100644
(file)
--- a/
include/linux/elfnote.h
+++ b/
include/linux/elfnote.h
@@
-38,17
+38,25
@@
* e.g. ELFNOTE(XYZCo, 42, .asciz, "forty-two")
* ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
*/
* e.g. ELFNOTE(XYZCo, 42, .asciz, "forty-two")
* ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
*/
-#define ELFNOTE
(name, type, desctype, descdata)
\
-.pushsection .note.name,
"",@note
; \
- .
align 4
; \
+#define ELFNOTE
_START(name, type, flags)
\
+.pushsection .note.name,
flags,@note
; \
+ .
balign 4
; \
.long 2f - 1f /* namesz */ ; \
.long 2f - 1f /* namesz */ ; \
- .long 4
f - 3f
/* descsz */ ; \
+ .long 4
484f - 3f
/* descsz */ ; \
.long type ; \
1:.asciz #name ; \
.long type ; \
1:.asciz #name ; \
-2:.align 4 ; \
-3:desctype descdata ; \
-4:.align 4 ; \
+2:.balign 4 ; \
+3:
+
+#define ELFNOTE_END \
+4484:.balign 4 ; \
.popsection ;
.popsection ;
+
+#define ELFNOTE(name, type, desc) \
+ ELFNOTE_START(name, type, "") \
+ desc ; \
+ ELFNOTE_END
+
#else /* !__ASSEMBLER__ */
#include <linux/elf.h>
/*
#else /* !__ASSEMBLER__ */
#include <linux/elf.h>
/*
@@
-68,7
+76,7
@@
typeof(desc) _desc \
__attribute__((aligned(sizeof(Elf##size##_Word)))); \
} _ELFNOTE_PASTE(_note_, unique) \
typeof(desc) _desc \
__attribute__((aligned(sizeof(Elf##size##_Word)))); \
} _ELFNOTE_PASTE(_note_, unique) \
- __
attribute_used__
\
+ __
used
\
__attribute__((section(".note." name), \
aligned(sizeof(Elf##size##_Word)), \
unused)) = { \
__attribute__((section(".note." name), \
aligned(sizeof(Elf##size##_Word)), \
unused)) = { \
This page took
0.025078 seconds
and
5
git commands to generate.