From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <binutils-return-38214-listarch-binutils=sources.redhat.com@sources.redhat.com>
Received: (qmail 417 invoked by alias); 24 Feb 2005 13:15:56 -0000
Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:binutils-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/binutils/>
List-Post: <mailto:binutils@sources.redhat.com>
List-Help: <mailto:binutils-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: binutils-owner@sources.redhat.com
Received: (qmail 32413 invoked from network); 24 Feb 2005 13:15:42 -0000
Received: from unknown (HELO mx1.redhat.com) (66.187.233.31)
  by sourceware.org with SMTP; 24 Feb 2005 13:15:42 -0000
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id j1ODFggv023126
	for <binutils@sources.redhat.com>; Thu, 24 Feb 2005 08:15:42 -0500
Received: from pobox.surrey.redhat.com (pobox.surrey.redhat.com [172.16.10.17])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id j1ODFfK04515
	for <binutils@sources.redhat.com>; Thu, 24 Feb 2005 08:15:41 -0500
Received: from localhost.localdomain.redhat.com (vpn83-133.boston.redhat.com [172.16.83.133])
	by pobox.surrey.redhat.com (8.12.8/8.12.8) with ESMTP id j1ODFcMR007833
	for <binutils@sources.redhat.com>; Thu, 24 Feb 2005 13:15:40 GMT
To: binutils@sources.redhat.com
Subject: Updated compile time warning fix: ld/emultempl/lnk960.em
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 24 Feb 2005 16:17:00 -0000
Message-ID: <m38y5e84x4.fsf@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SW-Source: 2005-02/txt/msg00586.txt.bz2

Hi Guys,

  Alan pointed out that there is no need to pass an empty string to
  concat so my patch to lnk960.em could have been better.  Hence I am
  applying the patch below to remedy this.

Cheers
  Nick

ld/ChangeLog
2005-02-24  Nick Clifton  <nickc@redhat.com>

	* emultempl/lnk960.em (lnk960_before_parse): Remove redundant
	empty string from calls to concat.

Index: ld/emultempl/lnk960.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/lnk960.em,v
retrieving revision 1.13
diff -c -3 -p -r1.13 lnk960.em
*** ld/emultempl/lnk960.em	27 Jun 2003 00:38:25 -0000	1.13
--- ld/emultempl/lnk960.em	24 Feb 2005 13:13:23 -0000
*************** lnk960_before_parse (void)
*** 94,105 ****
      {
        env = (char *) getenv (*p);
        if (env)
! 	ldfile_add_library_path (concat (env, "/lib/libcoff", ""), FALSE);
      }
  
    env = (char *) getenv ("I960BASE");
    if (env)
!     ldfile_add_library_path(concat (env, "/lib", ""), FALSE);
  
    ldfile_output_architecture = bfd_arch_i960;
    ldfile_output_machine = bfd_mach_i960_core;
--- 94,105 ----
      {
        env = (char *) getenv (*p);
        if (env)
! 	ldfile_add_library_path (concat (env, "/lib/libcoff", NULL), FALSE);
      }
  
    env = (char *) getenv ("I960BASE");
    if (env)
!     ldfile_add_library_path (concat (env, "/lib", NULL), FALSE);
  
    ldfile_output_architecture = bfd_arch_i960;
    ldfile_output_machine = bfd_mach_i960_core;
*************** lnk960_before_parse (void)
*** 119,126 ****
  	einfo ("%P%F I960BASE and G960BASE not set\n");
      }
  
! 
!   ldfile_add_library_path (concat (name, "/lib", ""), FALSE);
    ldfile_output_architecture = bfd_arch_i960;
    ldfile_output_machine = bfd_mach_i960_core;
  }
--- 119,125 ----
  	einfo ("%P%F I960BASE and G960BASE not set\n");
      }
  
!   ldfile_add_library_path (concat (name, "/lib", NULL), FALSE);
    ldfile_output_architecture = bfd_arch_i960;
    ldfile_output_machine = bfd_mach_i960_core;
  }