OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in (AR_FOR_TARGET, RANLIB_FOR_TARGET)

Browse Source 
(NM_FOR_TARGET): Use := and $(shell).
	(mainversion): Remove unused variable.

From-SVN: r82068
This commit is contained in:
Daniel Jacobowitz 2004-05-20 20:17:04 +00:00 committed by Daniel Jacobowitz
parent 8be123d4a9
commit 4ac29b3374
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-20 Daniel Jacobowitz <dan@debian.org>
* Makefile.in (AR_FOR_TARGET, RANLIB_FOR_TARGET)
(NM_FOR_TARGET): Use := and $(shell).
(mainversion): Remove unused variable.
2004-05-20 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* reorg.c (delete_from_delay_slot): If we have a barrier after the

13
gcc/Makefile.in
View File

@ -316,7 +316,7 @@ GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_WARN) -Wold-style-
# Programs which produce files for the target machine
# ---------------------------------------------------
AR_FOR_TARGET = ` \
AR_FOR_TARGET := $(shell \
if [ -f $(objdir)/../binutils/ar ] ; then \
echo $(objdir)/../binutils/ar ; \
else \
@ -325,11 +325,11 @@ AR_FOR_TARGET = ` \
else \
t='$(program_transform_name)'; echo ar | sed -e $$t ; \
fi; \
fi`
fi)
AR_FLAGS_FOR_TARGET =
AR_CREATE_FOR_TARGET = $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) rc
AR_EXTRACT_FOR_TARGET = $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) x
RANLIB_FOR_TARGET = ` \
RANLIB_FOR_TARGET := $(shell \
if [ -f $(objdir)/../binutils/ranlib ] ; then \
echo $(objdir)/../binutils/ranlib ; \
else \
@ -338,8 +338,8 @@ RANLIB_FOR_TARGET = ` \
else \
t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
fi; \
fi`
NM_FOR_TARGET = ` \
fi)
NM_FOR_TARGET := $(shell \
if [ -f ./nm ] ; then \
echo ./nm ; \
elif [ -f $(objdir)/../binutils/nm-new ] ; then \
@ -350,7 +350,7 @@ NM_FOR_TARGET = ` \
else \
t='$(program_transform_name)'; echo nm | sed -e $$t ; \
fi; \
fi`
fi)
# --------
# UNSORTED
@ -416,7 +416,6 @@ host_hook_obj=@out_host_hook_obj@
gcc_version=@gcc_version@
gcc_version_trigger=@gcc_version_trigger@
version=$(gcc_version)
mainversion=`grep version_string $(srcdir)/version.c | sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/'`
# ------------------------
# Installation directories