tools: Adopt __packed from kernel sources

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jun 20, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-06-20 09:02 UTC #0 lore raw

Commit-ID:  c9f5da742fa3dfebc49d03deb312522e5db643ed
Gitweb:     http://git.kernel.org/tip/c9f5da742fa3dfebc49d03deb312522e5db643ed
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 16 Jun 2017 11:39:15 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 19 Jun 2017 15:27:07 -0300

tools: Adopt __packed from kernel sources

To have a more compact way to ask the compiler to not insert alignment paddings in a struct, making tools/ look more like kernel source code.

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/include/linux/compiler-gcc.h | 2 ++
 tools/perf/util/genelf_debug.c     | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

tools/include/linux/compiler-gcc.h +2 -0

index c13e6f7..0f57a48 100644
@@ -22,6 +22,8 @@
 
 #define  noinline	__attribute__((noinline))
 
+#define __packed	__attribute__((packed))
+
 #define __noreturn	__attribute__((noreturn))
 
 #define __printf(a, b)	__attribute__((format(printf, a, b)))

tools/perf/util/genelf_debug.c +3 -2

index 5980f7d..40789d8 100644
@@ -11,6 +11,7 @@
  * @remark Copyright 2007 OProfile authors
  * @author Philippe Elie
  */
+#include <linux/compiler.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <getopt.h>

@@ -125,7 +126,7 @@ struct debug_line_header {
 	 * and filesize, last entry is followed by en empty string.
 	 */
 	/* follow the first program statement */
-} __attribute__((packed));
+} __packed;
 
 /* DWARF 2 spec talk only about one possible compilation unit header while
  * binutils can handle two flavours of dwarf 2, 32 and 64 bits, this is not

@@ -138,7 +139,7 @@ struct compilation_unit_header {
 	uhalf version;
 	uword debug_abbrev_offset;
 	ubyte pointer_size;
-} __attribute__((packed));
+} __packed;
 
 #define DW_LNS_num_opcode (DW_LNS_set_isa + 1)