diff options
| author | David Daney <david.daney@cavium.com> | 2012-01-17 16:41:01 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-01-24 17:26:33 -0500 |
| commit | 2ef1ea3826434bdebe17b2941356a8f764ff5fcd (patch) | |
| tree | 50e6d1272b370b7a52a3f7a0bffbc0e4908fc979 /tools/perf/builtin-probe.c | |
| parent | e3e877e79b7c6a322f9f628e87052c13581238cc (diff) | |
perf tools: Fix broken build by defining _GNU_SOURCE in Makefile
When building on my Debian/mips system, util/util.c fails to build
because commit 1aed2671738785e8f5aea663a6fda91aa7ef59b5 (perf kvm: Do
guest-only counting by default) indirectly includes stdio.h before the
feature selection in util.h is done. This prevents _GNU_SOURCE in
util.h from enabling the declaration of getline(), from now second
inclusion of stdio.h, and the build is broken.
There is another breakage in util/evsel.c caused by include ordering,
but I didn't fully track down the commit that caused it.
The root cause of all this is an inconsistent definition of _GNU_SOURCE,
so I move the definition into the Makefile so that it is passed to all
invocations of the compiler and used uniformly for all system header
files. All other #define and #undef of _GNU_SOURCE are removed as they
cause conflicts with the definition passed to the compiler.
All the features.h definitions (_LARGEFILE64_SOURCE _FILE_OFFSET_BITS=64
and _GNU_SOURCE) are needed by the python glue code too, so they are
moved to BASIC_CFLAGS, and the misleading comments about BASIC_CFLAGS
are removed.
This gives me a clean build on x86_64 (fc12) and mips (Debian).
Cc: David Daney <david.daney@cavium.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1326836461-11952-1-git-send-email-ddaney.cavm@gmail.com
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-probe.c')
| -rw-r--r-- | tools/perf/builtin-probe.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index 59d43abfbfec..fb8566181f27 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 20 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | #define _GNU_SOURCE | ||
| 24 | #include <sys/utsname.h> | 23 | #include <sys/utsname.h> |
| 25 | #include <sys/types.h> | 24 | #include <sys/types.h> |
| 26 | #include <sys/stat.h> | 25 | #include <sys/stat.h> |
| @@ -31,7 +30,6 @@ | |||
| 31 | #include <stdlib.h> | 30 | #include <stdlib.h> |
| 32 | #include <string.h> | 31 | #include <string.h> |
| 33 | 32 | ||
| 34 | #undef _GNU_SOURCE | ||
| 35 | #include "perf.h" | 33 | #include "perf.h" |
| 36 | #include "builtin.h" | 34 | #include "builtin.h" |
| 37 | #include "util/util.h" | 35 | #include "util/util.h" |