This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

add objdump to TOOLS_PROGS


uclinux systems use objdump when generating a FLT binary. Thus objdump should be considered a TOOLS_PROGS on those systems and installed in the tools' bin directory.

Currently, uclinux systems can pick up some tools from the tool bin directory (correctly) and pick up objdump somewhat randomly (by hoping PATH is correct).

This patch adds objdump to TOOLS_PROGS when configuring a uclinux target, ok?

nathan
--
Nathan Sidwell    ::   http://www.codesourcery.com   ::         CodeSourcery
nathan@codesourcery.com    ::     http://www.planetfall.pwp.blueyonder.co.uk

2007-02-26  Nathan Sidwell  <nathan@codesourcery.com>

	* Makefile.am (TOOL_PROGS): Set from @TOOL_PROGS@.
	(install-exec-local): Protect against TOOL_PROGS being empty.
	* configure.in (TOOL_PROGS): New, set it appropriately.
	* Makefile.in: Rebuilt.
	* configure: Rebuilt.

Index: binutils/configure
===================================================================
Index: binutils/configure.in
===================================================================
RCS file: /cvs/src/src/binutils/configure.in,v
retrieving revision 1.73
diff -c -3 -p -r1.73 configure.in
*** binutils/configure.in	17 Feb 2007 13:33:54 -0000	1.73
--- binutils/configure.in	26 Feb 2007 16:18:36 -0000
*************** BUILD_WINDRES=
*** 225,230 ****
--- 225,231 ----
  BUILD_DLLWRAP=
  BUILD_MISC=
  OBJDUMP_DEFS=
+ TOOL_PROGS="nm-new strip-new ar ranlib dlltool objdump"
  
  for targ in $target $canon_targets
  do
*************** do
*** 233,238 ****
--- 234,240 ----
  	BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
  	BUILD_SRCONV='$(SRCONV_PROG)'
  	NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
+ 	TOOL_PROGS="$TOOL_PROGS objcopy"
      else
  	case $targ in
  changequote(,)dnl
*************** changequote([,])dnl
*** 372,377 ****
--- 374,384 ----
  	  OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
  	  ;;
  	esac
+ 	case $targ in
+ 	*-uclinux)
+ 	  TOOL_PROGS="$TOOL_PROGS objcopy"
+ 	  ;;
+ 	esac
      fi
  done
  
*************** if test "${with_windres+set}" = set; the
*** 381,386 ****
--- 388,396 ----
  	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
  fi
  
+ # Remove duplicates from TOOL_PROGS
+ TOOL_PROGS="`echo $TOOL_PROGS | tr ' ' '\012' | sort -u | tr '\012' ' '`"
+ 
  AC_SUBST(NLMCONV_DEFS)
  AC_SUBST(BUILD_NLMCONV)
  AC_SUBST(BUILD_SRCONV)
*************** AC_SUBST(BUILD_WINDRES)
*** 390,395 ****
--- 400,406 ----
  AC_SUBST(BUILD_DLLWRAP)
  AC_SUBST(BUILD_MISC)
  AC_SUBST(OBJDUMP_DEFS)
+ AC_SUBST(TOOL_PROGS)
  
  AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])
  
Index: binutils/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.am,v
retrieving revision 1.81
diff -c -3 -p -r1.81 Makefile.am
*** binutils/Makefile.am	17 Feb 2007 13:33:53 -0000	1.81
--- binutils/Makefile.am	26 Feb 2007 16:18:38 -0000
*************** noinst_PROGRAMS = $(NM_PROG) $(STRIP_PRO
*** 61,67 ****
  EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(DLLWRAP_PROG)
  
  # Stuff that goes in tooldir/ if appropriate.
! TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump
  
  BASEDIR = $(srcdir)/..
  BFDDIR = $(BASEDIR)/bfd
--- 61,67 ----
  EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(DLLWRAP_PROG)
  
  # Stuff that goes in tooldir/ if appropriate.
! TOOL_PROGS = @TOOL_PROGS@
  
  BASEDIR = $(srcdir)/..
  BFDDIR = $(BASEDIR)/bfd
*************** install-exec-local: install-binPROGRAMS 
*** 413,420 ****
  	  else :; fi; \
  	done
  	$(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
! 	for i in $(TOOL_PROGS); do \
! 	  if [ -f $$i$(EXEEXT) ]; then \
  	    j=`echo $$i | sed -e 's/-new//'`; \
  	    k=`echo $$j | sed '$(transform)'`; \
  	    if [ "$(bindir)/$$k" != "$(tooldir)/bin/$$j" ]; then \
--- 413,420 ----
  	  else :; fi; \
  	done
  	$(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
! 	for i in . $(TOOL_PROGS); do \
! 	  if [ $$i != . ] && [ -f $$i$(EXEEXT) ]; then \
  	    j=`echo $$i | sed -e 's/-new//'`; \
  	    k=`echo $$j | sed '$(transform)'`; \
  	    if [ "$(bindir)/$$k" != "$(tooldir)/bin/$$j" ]; then \
Index: binutils/Makefile.in
===================================================================

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]