[PATCH 05/11] tools subcmd: Add missing NORETURN define for parse-options.h

From	Arnaldo Carvalho de Melo <acme@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH 05/11] tools subcmd: Add missing NORETURN define for parse-options.h
Date	2016-01-12 19:10 +0100
Message-ID	<qQbyi-4DG-9@gated-at.bofh.it> (permalink)
References	<qQboC-4jE-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Josh Poimboeuf <jpoimboe@redhat.com>

parse-options.h uses the NORETURN macro without defining it.  perf
doesn't see a build error because it defines the macro in util.h before
including parse-options.h.  But any other tool including it will see an
error.

Define the macro in parse-options.h (if not already defined) so that
other tools can include it.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Chris J Arges <chris.j.arges@canonical.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Pedro Alves <palves@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: live-patching@vger.kernel.org
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/6c16294ac6dbe5e2ca28fd935fe4389996588564.1450442274.git.jpoimboe@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/subcmd/parse-options.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/lib/subcmd/parse-options.h b/tools/lib/subcmd/parse-options.h
index 13a2cc1d6140..d60cab2726da 100644
--- a/tools/lib/subcmd/parse-options.h
+++ b/tools/lib/subcmd/parse-options.h
@@ -4,6 +4,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifndef NORETURN
+#define NORETURN __attribute__((__noreturn__))
+#endif
+
 enum parse_opt_type {
 	/* special types */
 	OPTION_END,
-- 
2.1.0

Thread

[GIT PULL 00/11] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:00 +0100
  [PATCH 11/11] perf tools: Fallback to srcdir/Documentation/tips.txt Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:00 +0100
  [PATCH 06/11] perf record: Add --buildid-all option Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:10 +0100
  [PATCH 09/11] perf tools: Set and pass DOCDIR to builtin-report.c Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:10 +0100
  [PATCH 05/11] tools subcmd: Add missing NORETURN define for parse-options.h Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:10 +0100
  [PATCH 04/11] tools: Fix formatting of the "make -C tools" help message Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:10 +0100
  [PATCH 08/11] perf tools: Add file_only config option to strlist Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:10 +0100
  [PATCH 03/11] tools: Make list.h self-sufficient Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:10 +0100
  [PATCH 07/11] perf tools: Add more usage tips Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-12 19:10 +0100
  Re: [GIT PULL 00/11] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-01-13 10:40 +0100

csiph-web