lkml.org 
[lkml]   [2011]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[101/143] perf: Use default compiler mode by default
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Michael S. Tsirkin <mst@redhat.com>

    commit 81516c5fc83a13a1d12f466aa7e14f5fd62a63ce upstream.

    gcc with no flags typically is a sane default for systems to
    use, and looking at the running kernel is probably broken for
    cross-builds anyway, so let's not do this. Add EXTRA_CFLAGS so
    that users can override default gcc mode if they want to.

    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Acked-by: Arjan van de Ven <arjan@infradead.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    LKML-Reference: <20091122121335.GA24254@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    [bwh: Backport to 2.6.32]
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    tools/perf/Makefile | 18 +++---------------
    1 file changed, 3 insertions(+), 15 deletions(-)

    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -148,6 +148,8 @@ all::
    # broken, or spawning external process is slower than built-in grep perf has).
    #
    # Define LDFLAGS=-static to build a static binary.
    +#
    +# Define EXTRA_CFLAGS=-m64 or EXTRA_CFLAGS=-m32 as appropriate for cross-builds.

    PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE
    @$(SHELL_PATH) util/PERF-VERSION-GEN
    @@ -160,20 +162,6 @@ uname_R := $(shell sh -c 'uname -r 2>/de
    uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
    uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')

    -#
    -# Add -m32 for cross-builds:
    -#
    -ifdef NO_64BIT
    - MBITS := -m32
    -else
    - #
    - # If we're on a 64-bit kernel, use -m64:
    - #
    - ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M))
    - MBITS := -m64
    - endif
    -endif
    -
    # CFLAGS and LDFLAGS are for the users to override from the command line.

    #
    @@ -210,7 +198,7 @@ ifndef PERF_DEBUG
    CFLAGS_OPTIMIZE = -O6
    endif

    -CFLAGS = $(MBITS) -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS)
    +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
    EXTLIBS = -lpthread -lrt -lelf -lm
    ALL_CFLAGS = $(CFLAGS)
    ALL_LDFLAGS = $(LDFLAGS)



    \
     
     \ /
      Last update: 2011-05-06 02:47    [W:4.287 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site