riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

* Makefile.am (TOOL_PROGS): Use an explicit $(EXEEXT). 

(install-exec-local): When handling $(noinst_PROGRAMS), only use
	$(EXEEXT) on the installed file.  When handling $(TOOL_PROGS),
	handle $(EXEEXT) correctly.
	* configure.in: Add an explicit $(EXEEXT) when substituting for
	the name of a program to build.
	* Makefile.in, configure: Rebuild.
gdb-4_18-branch
Ian Lance Taylor 29 years ago
parent
0426955144
commit
bf2a3cb1af
5 changed files with 55 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      binutils/ChangeLog
  2. 14
      binutils/Makefile.am
  3. 27
      binutils/Makefile.in
  4. 26
      binutils/configure
  5. 26
      binutils/configure.in

8
binutils/ChangeLog
View File

@ -1,5 +1,13 @@
Mon Aug 4 11:47:31 1997 Ian Lance Taylor <ian@cygnus.com> Mon Aug 4 11:47:31 1997 Ian Lance Taylor <ian@cygnus.com>
* Makefile.am (TOOL_PROGS): Use an explicit $(EXEEXT).
(install-exec-local): When handling $(noinst_PROGRAMS), only use
$(EXEEXT) on the installed file. When handling $(TOOL_PROGS),
handle $(EXEEXT) correctly.
* configure.in: Add an explicit $(EXEEXT) when substituting for
the name of a program to build.
* Makefile.in, configure: Rebuild.
* aclocal.m4, configure, Makefile.in: Rebuild with new automake * aclocal.m4, configure, Makefile.in: Rebuild with new automake
patches. patches.

14
binutils/Makefile.am
View File

@ -52,7 +52,7 @@ noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG)
EXTRA_PROGRAMS = $(NLMCONV_PROG) $(SRCONV_PROG) $(DLLTOOL_PROG) $(WINDRES_PROG) EXTRA_PROGRAMS = $(NLMCONV_PROG) $(SRCONV_PROG) $(DLLTOOL_PROG) $(WINDRES_PROG)
# Stuff that goes in tooldir/ if appropriate # Stuff that goes in tooldir/ if appropriate
TOOL_PROGS = nm.new strip.new ar ranlib $(DLLTOOL_PROG) TOOL_PROGS = nm.new strip.new ar$(EXEEXT) ranlib$(EXEEXT) dlltool$(EXEEXT)
BASEDIR = $(srcdir)/.. BASEDIR = $(srcdir)/..
BFDDIR = $(BASEDIR)/bfd BFDDIR = $(BASEDIR)/bfd
@ -300,17 +300,17 @@ CLEANFILES = dep.sed .dep .dep1
install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS) install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS)
@list='$(noinst_PROGRAMS)'; for p in $$list; do \ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT)"; \ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT)"; \
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT); \ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT); \
else :; fi; \ else :; fi; \
done done
for i in $(TOOL_PROGS); do \ for i in $(TOOL_PROGS); do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
j=`echo $$i | sed -e 's/.new//'`; \ j=`echo $$i | sed -e 's/.new//' -e 's/$(EXEEXT)//'`; \
rm -f $(tooldir)/bin/$$j; \ rm -f $(tooldir)/bin/$$j$(EXEEXT); \
k=`echo $$j | sed '$(transform)'`; \ k=`echo $$j | sed '$(transform)'`; \
ln $(bindir)/$$k $(tooldir)/bin/$$j >/dev/null 2>/dev/null \ ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
|| $(INSTALL_PROGRAM) $$i $(tooldir)/bin/$$j; \ || $(INSTALL_PROGRAM) $$i $(tooldir)/bin/$$j$(EXEEXT); \
else true; \ else true; \
fi; \ fi; \
done done

27
binutils/Makefile.in
View File

@ -126,7 +126,7 @@ noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG)
EXTRA_PROGRAMS = $(NLMCONV_PROG) $(SRCONV_PROG) $(DLLTOOL_PROG) $(WINDRES_PROG) EXTRA_PROGRAMS = $(NLMCONV_PROG) $(SRCONV_PROG) $(DLLTOOL_PROG) $(WINDRES_PROG)
# Stuff that goes in tooldir/ if appropriate # Stuff that goes in tooldir/ if appropriate
TOOL_PROGS = nm.new strip.new ar ranlib $(DLLTOOL_PROG) TOOL_PROGS = nm.new strip.new ar$(EXEEXT) ranlib$(EXEEXT) dlltool$(EXEEXT)
BASEDIR = $(srcdir)/.. BASEDIR = $(srcdir)/..
BFDDIR = $(BASEDIR)/bfd BFDDIR = $(BASEDIR)/bfd
@ -236,8 +236,9 @@ CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
bin_PROGRAMS = size$(EXEEXT) objdump$(EXEEXT) ar$(EXEEXT) \ bin_PROGRAMS = size$(EXEEXT) objdump$(EXEEXT) ar$(EXEEXT) \
strings$(EXEEXT) ranlib$(EXEEXT) c++filt$(EXEEXT) objcopy$(EXEEXT) \ strings$(EXEEXT) ranlib$(EXEEXT) c++filt$(EXEEXT) objcopy$(EXEEXT) \
addr2line$(EXEEXT) addr2line$(EXEEXT) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ \
noinst_PROGRAMS = nm.new$(EXEEXT) strip.new$(EXEEXT) @BUILD_WINDRES@
noinst_PROGRAMS = nm.new strip.new
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@ -496,12 +497,12 @@ addr2line$(EXEEXT): $(addr2line_OBJECTS) $(addr2line_DEPENDENCIES)
@rm -f addr2line$(EXEEXT) @rm -f addr2line$(EXEEXT)
$(LINK) $(addr2line_LDFLAGS) $(addr2line_OBJECTS) $(addr2line_LDADD) $(LIBS) $(LINK) $(addr2line_LDFLAGS) $(addr2line_OBJECTS) $(addr2line_LDADD) $(LIBS)
nm.new$(EXEEXT): $(nm_new_OBJECTS) $(nm_new_DEPENDENCIES) nm.new: $(nm_new_OBJECTS) $(nm_new_DEPENDENCIES)
@rm -f nm.new$(EXEEXT) @rm -f nm.new
$(LINK) $(nm_new_LDFLAGS) $(nm_new_OBJECTS) $(nm_new_LDADD) $(LIBS) $(LINK) $(nm_new_LDFLAGS) $(nm_new_OBJECTS) $(nm_new_LDADD) $(LIBS)
strip.new$(EXEEXT): $(strip_new_OBJECTS) $(strip_new_DEPENDENCIES) strip.new: $(strip_new_OBJECTS) $(strip_new_DEPENDENCIES)
@rm -f strip.new$(EXEEXT) @rm -f strip.new
$(LINK) $(strip_new_LDFLAGS) $(strip_new_OBJECTS) $(strip_new_LDADD) $(LIBS) $(LINK) $(strip_new_LDFLAGS) $(strip_new_OBJECTS) $(strip_new_LDADD) $(LIBS)
.y.c: .y.c:
$(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(YFLAGS) $(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(YFLAGS)
@ -1003,17 +1004,17 @@ $(DEMANGLER_PROG).1: cxxfilt.man Makefile
install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS) install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS)
@list='$(noinst_PROGRAMS)'; for p in $$list; do \ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT)"; \ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT)"; \
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT); \ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT); \
else :; fi; \ else :; fi; \
done done
for i in $(TOOL_PROGS); do \ for i in $(TOOL_PROGS); do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
j=`echo $$i | sed -e 's/.new//'`; \ j=`echo $$i | sed -e 's/.new//' -e 's/$(EXEEXT)//'`; \
rm -f $(tooldir)/bin/$$j; \ rm -f $(tooldir)/bin/$$j$(EXEEXT); \
k=`echo $$j | sed '$(transform)'`; \ k=`echo $$j | sed '$(transform)'`; \
ln $(bindir)/$$k $(tooldir)/bin/$$j >/dev/null 2>/dev/null \ ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
|| $(INSTALL_PROGRAM) $$i $(tooldir)/bin/$$j; \ || $(INSTALL_PROGRAM) $$i $(tooldir)/bin/$$j$(EXEEXT); \
else true; \ else true; \
fi; \ fi; \
done done

26
binutils/configure
View File

@ -2901,46 +2901,46 @@ for targ in $target $canon_targets
do do
if test "x$targ" = "xall"; then if test "x$targ" = "xall"; then
all_targets=true all_targets=true
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
BUILD_SRCONV='$(SRCONV_PROG)' BUILD_SRCONV='$(SRCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC" NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
else else
case $targ in case $targ in
i[3456]86*-*-netware*) i[3456]86*-*-netware*)
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386" NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
;; ;;
alpha*-*-netware*) alpha*-*-netware*)
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA" NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA"
;; ;;
powerpc*-*-netware*) powerpc*-*-netware*)
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC" NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC"
;; ;;
sparc*-*-netware*) sparc*-*-netware*)
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC" NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC"
;; ;;
esac esac
case $targ in case $targ in
*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;; *-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)$(EXEEXT)' ;;
esac esac
case $targ in case $targ in
arm-*pe*) arm-*pe*)
BUILD_DLLTOOL='$(DLLTOOL_PROG)' BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM" DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
BUILD_WINDRES='$(WINDRES_PROG)' BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
;; ;;
i[3-6]86-*pe* | i[3-6]86-*-cygwin32) i[3-6]86-*pe* | i[3-6]86-*-cygwin32)
BUILD_DLLTOOL='$(DLLTOOL_PROG)' BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386" DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
BUILD_WINDRES='$(WINDRES_PROG)' BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
;; ;;
powerpc*-*-*pe* | powerpc*-*-cygwin32) powerpc*-*-*pe* | powerpc*-*-cygwin32)
BUILD_DLLTOOL='$(DLLTOOL_PROG)' BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_PPC" DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_PPC"
BUILD_WINDRES='$(WINDRES_PROG)' BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
;; ;;
esac esac
fi fi

26
binutils/configure.in
View File

@ -140,50 +140,50 @@ for targ in $target $canon_targets
do do
if test "x$targ" = "xall"; then if test "x$targ" = "xall"; then
all_targets=true all_targets=true
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
BUILD_SRCONV='$(SRCONV_PROG)' BUILD_SRCONV='$(SRCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC" NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
else else
case $targ in case $targ in
changequote(,)dnl changequote(,)dnl
i[3456]86*-*-netware*) i[3456]86*-*-netware*)
changequote([,])dnl changequote([,])dnl
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386" NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
;; ;;
alpha*-*-netware*) alpha*-*-netware*)
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA" NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA"
;; ;;
powerpc*-*-netware*) powerpc*-*-netware*)
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC" NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC"
;; ;;
sparc*-*-netware*) sparc*-*-netware*)
BUILD_NLMCONV='$(NLMCONV_PROG)' BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC" NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC"
;; ;;
esac esac
case $targ in case $targ in
*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;; *-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)$(EXEEXT)' ;;
esac esac
case $targ in case $targ in
arm-*pe*) arm-*pe*)
BUILD_DLLTOOL='$(DLLTOOL_PROG)' BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM" DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
BUILD_WINDRES='$(WINDRES_PROG)' BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
;; ;;
changequote(,)dnl changequote(,)dnl
i[3-6]86-*pe* | i[3-6]86-*-cygwin32) i[3-6]86-*pe* | i[3-6]86-*-cygwin32)
changequote([,])dnl changequote([,])dnl
BUILD_DLLTOOL='$(DLLTOOL_PROG)' BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386" DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
BUILD_WINDRES='$(WINDRES_PROG)' BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
;; ;;
powerpc*-*-*pe* | powerpc*-*-cygwin32) powerpc*-*-*pe* | powerpc*-*-cygwin32)
BUILD_DLLTOOL='$(DLLTOOL_PROG)' BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_PPC" DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_PPC"
BUILD_WINDRES='$(WINDRES_PROG)' BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
;; ;;
esac esac
fi fi

Write Preview
Loading…
Cancel
Save