Commit: e0e87b8c940625b72988c476f1dd36a33e64bfa6 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revision: e0e87b8c940625b72988c476f1dd36a33e64bfa6 (tree)
• Time: 2006-11-13 18:59:52
• Author: Nathan Sidwell <nathan@code...>
• Commiter: Nathan Sidwell

Log Message

binutils/
* 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.

Change Summary

• modified: ChangeLog.csl
• modified: binutils/Makefile.am
• modified: binutils/Makefile.in
• modified: binutils/configure
• modified: binutils/configure.in

Incremental Difference

--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,5 +1,15 @@
[phone]  Nathan Sidwell  <[e-mail]>
+
+	binutils/
+	* 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.
+
 2006-11-08  Vladimir Prus  <[e-mail]>
 
+	libiberty/
 	* pex-win32.c (no_suffixes): Remove.
 	(std_suffixes): Add "" as first element.
 	(find_executable): Remove detection of already-present

--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -64,7 +64,7 @@ noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG)
 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
+TOOL_PROGS = @TOOL_PROGS@
 
 BASEDIR = $(srcdir)/..
 BFDDIR = $(BASEDIR)/bfd
@@ -390,8 +390,8 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 	  else :; fi; \
 	done
 	$(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
-	for i in $(TOOL_PROGS); do \
-	  if [ -f $$i$(EXEEXT) ]; then \
+	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 \

--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -396,7 +396,7 @@ SRCONV_PROG = srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT)
 PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_MISC@
 
 # Stuff that goes in tooldir/ if appropriate.
-TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump
+TOOL_PROGS = @TOOL_PROGS@
 BASEDIR = $(srcdir)/..
 BFDDIR = $(BASEDIR)/bfd
 INCDIR = $(BASEDIR)/include
@@ -1142,8 +1142,8 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 	  else :; fi; \
 	done
 	$(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
-	for i in $(TOOL_PROGS); do \
-	  if [ -f $$i$(EXEEXT) ]; then \
+	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 \

--- a/binutils/configure
+++ b/binutils/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL REPORT_BUGS_TO WARN_CFLAGS NO_WERROR YACC LEX LEXLIB LEX_OUTPUT_ROOT CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT HDEFINES AR CC_FOR_BUILD EXEEXT_FOR_BUILD DEMANGLER_NAME NLMCONV_DEFS BUILD_NLMCONV BUILD_SRCONV BUILD_DLLTOOL DLLTOOL_DEFS BUILD_WINDRES BUILD_DLLWRAP BUILD_MISC OBJDUMP_DEFS EMULATION EMULATION_VECTOR datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL REPORT_BUGS_TO WARN_CFLAGS NO_WERROR YACC LEX LEXLIB LEX_OUTPUT_ROOT CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT HDEFINES AR CC_FOR_BUILD EXEEXT_FOR_BUILD DEMANGLER_NAME NLMCONV_DEFS BUILD_NLMCONV BUILD_SRCONV BUILD_DLLTOOL DLLTOOL_DEFS BUILD_WINDRES BUILD_DLLWRAP BUILD_MISC OBJDUMP_DEFS TOOL_PROGS EMULATION EMULATION_VECTOR datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -10689,6 +10689,7 @@ BUILD_WINDRES=
 BUILD_DLLWRAP=
 BUILD_MISC=
 OBJDUMP_DEFS=
+TOOL_PROGS="nm-new strip-new ar ranlib dlltool objdump"
 
 for targ in $target $canon_targets
 do
@@ -10697,6 +10698,7 @@ do
 	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
 	i[3-7]86*-*-netware*)
@@ -10775,6 +10777,11 @@ do
 	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
 	  ;;
 	esac
+	case $targ in
+	*-uclinux)
+	  TOOL_PROGS="$TOOL_PROGS objcopy"
+	  ;;
+	esac
     fi
 done
 
@@ -10782,6 +10789,10 @@ if test "${with_windres+set}" = set; then
 	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
 fi
 
+# Remove duplicates from TOOL_PROGS
+TOOL_PROGS="`echo $TOOL_PROGS | tr ' ' '\n' | sort -u | tr '\n' ' '`"
+
+
 
 
 
@@ -11586,6 +11597,7 @@ s,@BUILD_WINDRES@,$BUILD_WINDRES,;t t
 s,@BUILD_DLLWRAP@,$BUILD_DLLWRAP,;t t
 s,@BUILD_MISC@,$BUILD_MISC,;t t
 s,@OBJDUMP_DEFS@,$OBJDUMP_DEFS,;t t
+s,@TOOL_PROGS@,$TOOL_PROGS,;t t
 s,@EMULATION@,$EMULATION,;t t
 s,@EMULATION_VECTOR@,$EMULATION_VECTOR,;t t
 s,@datarootdir@,$datarootdir,;t t

--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -216,6 +216,7 @@ BUILD_WINDRES=
 BUILD_DLLWRAP=
 BUILD_MISC=
 OBJDUMP_DEFS=
+TOOL_PROGS="nm-new strip-new ar ranlib dlltool objdump"
 
 for targ in $target $canon_targets
 do
@@ -224,6 +225,7 @@ do
 	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
@@ -310,6 +312,11 @@ changequote([,])dnl
 	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
 	  ;;
 	esac
+	case $targ in
+	*-uclinux)
+	  TOOL_PROGS="$TOOL_PROGS objcopy"
+	  ;;
+	esac
     fi
 done
 
@@ -317,6 +324,9 @@ if test "${with_windres+set}" = set; then
 	  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)
@@ -326,6 +336,7 @@ AC_SUBST(BUILD_WINDRES)
 AC_SUBST(BUILD_DLLWRAP)
 AC_SUBST(BUILD_MISC)
 AC_SUBST(OBJDUMP_DEFS)
+AC_SUBST(TOOL_PROGS)
 
 AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])