Re: [Qemu-devel] [PATCH 4/7] clean build: Fix arm build warnings

[Aurelien Jarno <aurelien@aurel32.net>]

On Sat, Feb 21, 2009 at 08:00:55PM +0100, Jan Kiszka wrote:
> Fix remaining arm warnings - except for the mess in the NetWinder FP
> emulator.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Thanks, applied.

> ---
> 
>  arm-dis.c           |   45 ---------------------------------------------
>  hw/arm_boot.c       |    2 +-
>  hw/omap_clk.c       |   17 -----------------
>  target-arm/helper.c |    2 +-
>  4 files changed, 2 insertions(+), 64 deletions(-)
> 
> diff --git a/arm-dis.c b/arm-dis.c
> index ee44292..cc42576 100644
> --- a/arm-dis.c
> +++ b/arm-dis.c
> @@ -1554,32 +1554,6 @@ enum map_type last_type;
>  int last_mapping_sym = -1;
>  bfd_vma last_mapping_addr = 0;
>  
> -\f

> -/* Functions.  */
> -int
> -get_arm_regname_num_options (void)
> -{
> -  return NUM_ARM_REGNAMES;
> -}
> -
> -int
> -set_arm_regname_option (int option)
> -{
> -  int old = regname_selected;
> -  regname_selected = option;
> -  return old;
> -}
> -
> -int
> -get_arm_regnames (int option, const char **setname, const char **setdescription,
> -		  const char *const **register_names)
> -{
> -  *setname = regnames[option].name;
> -  *setdescription = regnames[option].description;
> -  *register_names = regnames[option].reg_names;
> -  return 16;
> -}
> -
>  /* Decode a bitfield of the form matching regexp (N(-N)?,)*N(-N)?.
>     Returns pointer to following character of the format string and
>     fills in *VALUEP and *WIDTHP with the extracted value and number of
> @@ -4144,22 +4118,3 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
>      }
>    return size;
>  }
> -
> -void
> -print_arm_disassembler_options (FILE *stream)
> -{
> -  int i;
> -
> -  fprintf (stream, _("\n\
> -The following ARM specific disassembler options are supported for use with\n\
> -the -M switch:\n"));
> -
> -  for (i = NUM_ARM_REGNAMES; i--;)
> -    fprintf (stream, "  reg-names-%s %*c%s\n",
> -	     regnames[i].name,
> -	     (int)(14 - strlen (regnames[i].name)), ' ',
> -	     regnames[i].description);
> -
> -  fprintf (stream, "  force-thumb              Assume all insns are Thumb insns\n");
> -  fprintf (stream, "  no-force-thumb           Examine preceeding label to determine an insn's type\n\n");
> -}
> diff --git a/hw/arm_boot.c b/hw/arm_boot.c
> index cf9616a..fe17ffc 100644
> --- a/hw/arm_boot.c
> +++ b/hw/arm_boot.c
> @@ -107,7 +107,7 @@ static void set_kernel_args_old(struct arm_boot_info *info,
>                  int initrd_size, void *base)
>  {
>      uint32_t *p;
> -    unsigned char *s;
> +    char *s;
>  
>      /* see linux/include/asm-arm/setup.h */
>      p = (uint32_t *)(base + KERNEL_ARGS_ADDR);
> diff --git a/hw/omap_clk.c b/hw/omap_clk.c
> index 38b098e..d7a5a57 100644
> --- a/hw/omap_clk.c
> +++ b/hw/omap_clk.c
> @@ -1098,23 +1098,6 @@ void omap_clk_adduser(struct clk *clk, qemu_irq user)
>      *i = user;
>  }
>  
> -/* If a clock is allowed to idle, it is disabled automatically when
> - * all of clock domains using it are disabled.  */
> -static int omap_clk_is_idle(struct clk *clk)
> -{
> -    struct clk *chld;
> -
> -    if (!clk->enabled && (!clk->usecount || !(clk->flags && ALWAYS_ENABLED)))
> -        return 1;
> -    if (clk->usecount)
> -        return 0;
> -
> -    for (chld = clk->child1; chld; chld = chld->sibling)
> -        if (!omap_clk_is_idle(chld))
> -            return 0;
> -    return 1;
> -}
> -
>  struct clk *omap_findclk(struct omap_mpu_state_s *mpu, const char *name)
>  {
>      struct clk *i;
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 3250fb8..d6362ca 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -690,7 +690,7 @@ static void do_v7m_exception_exit(CPUARMState *env)
>         pointer.  */
>  }
>  
> -void do_interrupt_v7m(CPUARMState *env)
> +static void do_interrupt_v7m(CPUARMState *env)
>  {
>      uint32_t xpsr = xpsr_read(env);
>      uint32_t lr;
> 
> 
> 
> 

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net