Patchwork [1/2] perf: remove CFLAGS override

login
register
mail settings
Submitter Ting Liu
Date July 23, 2014, 3:58 a.m.
Message ID <1406087937-32112-1-git-send-email-ting.liu@freescale.com>
Download mbox | patch
Permalink /patch/76455/
State Accepted
Commit 78a38c8ab296eeb773429ce709b33f764af2c26c
Headers show

Comments

Ting Liu - July 23, 2014, 3:58 a.m.
From: Ting Liu <ting.liu@freescale.com>

definition of __SANE_USERSPACE_TYPES__ was added in kernel source by
commit e3541ec75219819d3235f80125a1a75d798ff6e1
perf tools, powerpc: Fix compile warnings in tests/attr.c

Overriding the CFLAGS makes it impossible for kernel build system to
append to it, thus making the build fail in various ways as:

|     CC /.../perf/1.0-r9/perf-1.0/perf.o
| In file included from builtin.h:4:0,
|                  from perf.c:9:
| util/util.h:74:24: fatal error: lk/debugfs.h: No such file or directory
|  #include <lk/debugfs.h>
|                         ^
| compilation terminated.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 meta/recipes-kernel/perf/perf.bb | 7 -------
 1 file changed, 7 deletions(-)

Patch

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 20968f9..222ae83 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -92,13 +92,6 @@  EXTRA_OEMAKE += "\
 	'infodir=${@os.path.relpath(infodir, prefix)}' \
 "
 
-# PPC64 uses long long for u64 in the kernel, but powerpc's asm/types.h
-# prevents 64-bit userland from seeing this definition, instead defaulting
-# to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__ to get 
-# int-ll64.h included. And MIPS64 has the same issue.
-EXTRA_OEMAKE_append_powerpc64 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__'
-EXTRA_OEMAKE_append_mips64 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__'
-
 PARALLEL_MAKE = ""
 
 do_compile() {