From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Huth <thuth@redhat.com>
Subject: Re: [kvm-unit-tests PATCH v2 4/4] powerpc/ppc64: populate argv[0]
 with prognam
Date: Fri, 22 Apr 2016 19:50:46 +0200
Message-ID: <571A6476.8030505@redhat.com>
References: <1461336889-27472-1-git-send-email-drjones@redhat.com>
 <1461336889-27472-5-git-send-email-drjones@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Cc: lvivier@redhat.com, rkrcmar@redhat.com
To: Andrew Jones <drjones@redhat.com>, kvm@vger.kernel.org
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:34616 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752461AbcDVRut (ORCPT <rfc822;kvm@vger.kernel.org>);
	Fri, 22 Apr 2016 13:50:49 -0400
Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 80EE57F08B
	for <kvm@vger.kernel.org>; Fri, 22 Apr 2016 17:50:49 +0000 (UTC)
In-Reply-To: <1461336889-27472-5-git-send-email-drjones@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 22.04.2016 16:54, Andrew Jones wrote:
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
>  lib/argv.c              | 6 ------
>  powerpc/Makefile.common | 6 +++++-
>  2 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/lib/argv.c b/lib/argv.c
> index 66cd43f24d336..63b9ab2af2d2a 100644
> --- a/lib/argv.c
> +++ b/lib/argv.c
> @@ -38,9 +38,7 @@ void __setup_args(void)
>  
>  void setup_args(char *args)
>  {
> -#if defined(__arm__) || defined(__aarch64__)
>      const char *p;
> -#endif
>  
>      if (args) {
>          __args = args;
> @@ -51,13 +49,9 @@ void setup_args(char *args)
>      } else {
>          copy_ptr = __args_copy;
>      }
> -#if defined(__arm__) || defined(__aarch64__)
>      __argv[0] = copy_ptr;
>      p = auxinfo.prognam;
>      while ((*copy_ptr++ = *p++) != 0)
>          ;
> -#else
> -    __argv[0] = NULL; //HACK: just reserve argv[0] for now
> -#endif
>      ++__argc;
>  }
> diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
> index 4449aec616853..150f5fc06bc2b 100644
> --- a/powerpc/Makefile.common
> +++ b/powerpc/Makefile.common
> @@ -24,6 +24,7 @@ CFLAGS += -fpie
>  
>  asm-offsets = lib/$(ARCH)/asm-offsets.h
>  include scripts/asm-offsets.mak
> +include scripts/auxinfo.mak
>  
>  cflatobjs += lib/util.o
>  cflatobjs += lib/alloc.o
> @@ -38,9 +39,12 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive)
>  %.elf: CFLAGS += $(arch_CFLAGS)
>  %.elf: LDFLAGS = $(arch_LDFLAGS) -nostdlib -pie
>  %.elf: %.o $(FLATLIBS) powerpc/flat.lds
> +	$(call gen-auxinfo,$(@:.elf=.aux.c),$@)
> +	$(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) $(@:.elf=.aux.c)
>  	$(LD) $(LDFLAGS) -o $@ \
>  	      -T powerpc/flat.lds --build-id=none \
> -		$(filter %.o, $^) $(FLATLIBS)
> +		$(filter %.o, $^) $(FLATLIBS) $(@:.elf=.aux.o)
> +	$(RM) $(@:.elf=.aux).*
>  	@echo -n Checking $@ for unsupported reloc types...
>  	@if $(OBJDUMP) -R $@ | grep R_ | grep -v R_PPC64_RELATIVE; then	\
>  		false;							\
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>