PR other/46202: implement install-strip.

/:
	PR other/46202
	* configure.ac: Fix just-built in-tree STRIP name to be
	binutils/strip-new.
	* configure: Regenerate.
	* Makefile.def (install-strip-gcc, install-strip-binutils)
	(install-strip-opcodes, install-strip-ld, install-strip-itcl)
	(install-strip-sid): Mirror dependencies on non-strip variants
	of these targets on the respective -strip prerequisites.
	* Makefile.tpl (install-strip, install-strip-host)
	(install-strip-target): New targets.
	(install-strip-[+module+], install-strip-target-[+module+]):
	New targets.
	* Makefile.in: Regenerate.

gcc/:
	PR other/46202
	* Makefile.in (install_sh, INSTALL_STRIP_PROGRAM): New
	variables.
	(AR_FOR_TARGET, RANLIB_FOR_TARGET, STRIP_FOR_TARGET): Fix
	shell quoting.
	(STRIP_FOR_TARGET): Look for in-tree strip under name strip-new.
	(install-strip): New target.
	(STRIPPROG): New variable, exported if STRIP is set.
	* doc/install.texi (Final install): Minor markup and code style
	fixes.  Document install-strip target.

fixincludes/:
	PR other/46202
	* Makefile.in (install-strip): New phony target.
	(all, check, install): Also mark as phony.

libgcc/:
	PR other/46202
	* Makefile.in (install-strip): New phony target.

libiberty/:
	PR other/46202
	* Makefile.in (install-strip): New phony target.
	(install): Also mark as phony.

gnattools/:
	PR other/46202
	* Makefile.in (install-strip): New phony target.
	(check, installcheck, info, dvi, pdf, html, install)
	(install-info, install-pdf, install-html, mostlyclean)
	(clean, distclean, maintainer-clean): Mark phony.

libada/:
	PR other/46202
	* Makefile.in (install-strip): New phony target.
	(check, installcheck, info, dvi, pdf, html, install)
	(install-info, install-pdf, install-html, mostlyclean)
	(clean, distclean, maintainer-clean): Mark phony.

From-SVN: r166980
This commit is contained in:
Ralf Wildenhues 2010-11-20 19:37:08 +00:00 committed by Ralf Wildenhues
parent c3b39f2ee1
commit 455c8f4873
20 changed files with 1743 additions and 17 deletions

View File

@ -1,3 +1,19 @@
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR other/46202
* configure.ac: Fix just-built in-tree STRIP name to be
binutils/strip-new.
* configure: Regenerate.
* Makefile.def (install-strip-gcc, install-strip-binutils)
(install-strip-opcodes, install-strip-ld, install-strip-itcl)
(install-strip-sid): Mirror dependencies on non-strip variants
of these targets on the respective -strip prerequisites.
* Makefile.tpl (install-strip, install-strip-host)
(install-strip-target): New targets.
(install-strip-[+module+], install-strip-target-[+module+]):
New targets.
* Makefile.in: Regenerate.
2010-11-19 Tobias Grosser <grosser@fim.uni-passau.de>
* config/cloog.m4: Use AS_HELP_STRING and fix help formatting.

View File

@ -350,6 +350,7 @@ dependencies = { module=dvi-gcc; on=all-build-libiberty; };
dependencies = { module=pdf-gcc; on=all-build-libiberty; };
dependencies = { module=html-gcc; on=all-build-libiberty; };
dependencies = { module=install-gcc ; on=install-fixincludes; };
dependencies = { module=install-strip-gcc ; on=install-strip-fixincludes; };
dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; };
dependencies = { module=configure-libcpp; on=configure-intl; };
@ -411,9 +412,11 @@ dependencies = { module=all-binutils; on=all-intl; };
// binutils might be on PATH, and they might need the shared opcodes
// library.
dependencies = { module=install-binutils; on=install-opcodes; };
dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
// libopcodes depends on libbfd
dependencies = { module=install-opcodes; on=install-bfd; };
dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
dependencies = { module=configure-gas; on=configure-intl; };
dependencies = { module=all-gas; on=all-libiberty; };
@ -434,6 +437,7 @@ dependencies = { module=all-ld; on=all-build-byacc; };
dependencies = { module=all-ld; on=all-build-flex; };
dependencies = { module=all-ld; on=all-intl; };
dependencies = { module=install-ld; on=install-gold; };
dependencies = { module=install-strip-ld; on=install-strip-gold; };
dependencies = { module=configure-gold; on=configure-intl; };
dependencies = { module=all-gold; on=all-libiberty; };
dependencies = { module=all-gold; on=all-intl; };
@ -464,6 +468,7 @@ dependencies = { module=configure-itcl; on=configure-tk; };
dependencies = { module=all-itcl; on=all-tcl; };
dependencies = { module=all-itcl; on=all-tk; };
dependencies = { module=install-itcl; on=install-tcl; };
dependencies = { module=install-strip-itcl; on=install-strip-tcl; };
dependencies = { module=configure-tk; on=configure-tcl; };
dependencies = { module=all-tk; on=all-tcl; };
@ -474,7 +479,9 @@ dependencies = { module=all-sid; on=all-opcodes; };
dependencies = { module=all-sid; on=all-tcl; };
dependencies = { module=all-sid; on=all-tk; };
dependencies = { module=install-sid; on=install-tcl; };
dependencies = { module=install-strip-sid; on=install-strip-tcl; };
dependencies = { module=install-sid; on=install-tk; };
dependencies = { module=install-strip-sid; on=install-strip-tk; };
dependencies = { module=configure-sim; on=configure-intl; };
dependencies = { module=all-sim; on=all-intl; };

File diff suppressed because it is too large Load Diff

View File

@ -889,6 +889,26 @@ install.all: install-no-fixedincludes
install-no-fixedincludes: installdirs install-host-nogcc \
install-target gcc-no-fixedincludes
.PHONY: install-strip
install-strip:
@: $(MAKE); $(unstage)
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-strip-host install-strip-target
.PHONY: install-strip-host
install-strip-host: [+
FOR host_modules +] \
maybe-install-strip-[+module+][+
ENDFOR host_modules +]
.PHONY: install-strip-target
install-strip-target: [+
FOR target_modules +] \
maybe-install-strip-target-[+module+][+
ENDFOR target_modules +]
### other supporting targets
MAKEDIRS= \
@ -1174,6 +1194,23 @@ install-[+module+]: installdirs
[+ ENDIF no_install +]
@endif [+module+]
.PHONY: install-strip-[+module+] maybe-install-strip-[+module+]
maybe-install-strip-[+module+]:
@if [+module+]
maybe-install-strip-[+module+]: install-strip-[+module+]
[+ IF no_install +]
install-strip-[+module+]:
[+ ELSE install +]
install-strip-[+module+]: installdirs
@: $(MAKE); $(unstage)
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/[+module+] && \
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] install-strip)
[+ ENDIF no_install +]
@endif [+module+]
# Other targets (info, dvi, pdf, etc.)
[+ FOR recursive_targets +]
.PHONY: maybe-[+make_target+]-[+module+] [+make_target+]-[+module+]
@ -1286,6 +1323,28 @@ ENDIF raw_cxx +]
[+ ENDIF no_install +]
@endif target-[+module+]
.PHONY: install-strip-target-[+module+] maybe-install-strip-target-[+module+]
maybe-install-strip-target-[+module+]:
@if target-[+module+]
maybe-install-strip-target-[+module+]: install-strip-target-[+module+]
[+ IF no_install +]
# Dummy target for uninstallable.
install-strip-target-[+module+]:
[+ ELSE install +]
install-strip-target-[+module+]: installdirs
@: $(MAKE); $(unstage)
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
IF raw_cxx +]
$(RAW_CXX_TARGET_EXPORTS) \[+
ELSE normal_cxx +]
$(NORMAL_TARGET_EXPORTS) \[+
ENDIF raw_cxx +]
(cd $(TARGET_SUBDIR)/[+module+] && \
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+extra_make_flags+] install-strip)
[+ ENDIF no_install +]
@endif target-[+module+]
# Other targets (info, dvi, pdf, etc.)
[+ FOR recursive_targets +]
.PHONY: maybe-[+make_target+]-target-[+module+] [+make_target+]-target-[+module+]

2
configure vendored
View File

@ -13812,7 +13812,7 @@ else
if test $ok = yes; then
# An in-tree tool is available and we can use it
STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip'
STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip-new'
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
$as_echo "just compiled" >&6; }
elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then

View File

@ -3204,7 +3204,7 @@ GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump])
GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib])
GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip])
GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip-new])
GCC_TARGET_TOOL(windres, WINDRES_FOR_TARGET, WINDRES, [binutils/windres])
GCC_TARGET_TOOL(windmc, WINDMC_FOR_TARGET, WINDMC, [binutils/windmc])

View File

@ -1,3 +1,9 @@
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR other/46202
* Makefile.in (install-strip): New phony target.
(all, check, install): Also mark as phony.
2010-11-09 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* inclhack.def (irix_pthread_init): New fix.

View File

@ -188,6 +188,11 @@ install : all
$(DESTDIR)$(itoolsdir)/fixincl@EXEEXT@
$(INSTALL_SCRIPT) mkheaders $(DESTDIR)$(itoolsdir)/mkheaders
install-strip: install
test -z '$(STRIP)' \
|| $(STRIP) $(DESTDIR)$(itoolsdir)/fixincl@EXEEXT@
.PHONY: all check install install-strip
.PHONY: dvi pdf info html install-pdf install-info install-html
dvi :

View File

@ -1,3 +1,16 @@
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR other/46202
* Makefile.in (install_sh, INSTALL_STRIP_PROGRAM): New
variables.
(AR_FOR_TARGET, RANLIB_FOR_TARGET, STRIP_FOR_TARGET): Fix
shell quoting.
(STRIP_FOR_TARGET): Look for in-tree strip under name strip-new.
(install-strip): New target.
(STRIPPROG): New variable, exported if STRIP is set.
* doc/install.texi (Final install): Minor markup and code style
fixes. Document install-strip target.
2010-11-20 Paul Koning <ni1d@arrl.net>
* config/pdp11/pdp11-protos.h (pdp11_initial_elimination_offset,

View File

@ -22,7 +22,7 @@
#<http://www.gnu.org/licenses/>.
# The targets for external use include:
# all, doc, install, install-cross, install-cross-rest,
# all, doc, install, install-cross, install-cross-rest, install-strip,
# uninstall, TAGS, mostlyclean, clean, distclean, maintainer-clean.
# This is the default target.
@ -255,6 +255,8 @@ LN_S=@LN_S@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL@
install_sh = $(SHELL) $(srcdir)/../install-sh
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
MAKEINFO = @MAKEINFO@
MAKEINFOFLAGS = --no-split
TEXI2DVI = texi2dvi
@ -387,7 +389,7 @@ AR_FOR_TARGET := $(shell \
if [ "$(host)" = "$(target)" ] ; then \
echo $(AR); \
else \
t='$(program_transform_name)'; echo ar | sed -e $$t ; \
t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \
fi; \
fi)
AR_FLAGS_FOR_TARGET =
@ -402,20 +404,20 @@ RANLIB_FOR_TARGET := $(shell \
if [ "$(host)" = "$(target)" ] ; then \
echo $(RANLIB); \
else \
t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \
fi; \
fi)
ORIGINAL_LD_FOR_TARGET = @ORIGINAL_LD_FOR_TARGET@
ORIGINAL_NM_FOR_TARGET = @ORIGINAL_NM_FOR_TARGET@
NM_FOR_TARGET = ./nm
STRIP_FOR_TARGET := $(shell \
if [ -f $(objdir)/../binutils/strip ] ; then \
echo $(objdir)/../binutils/strip ; \
if [ -f $(objdir)/../binutils/strip-new ] ; then \
echo $(objdir)/../binutils/strip-new ; \
else \
if [ "$(host)" = "$(target)" ] ; then \
echo strip; \
else \
t='$(program_transform_name)'; echo strip | sed -e $$t ; \
t='$(program_transform_name)'; echo strip | sed -e "$$t" ; \
fi; \
fi)
@ -4488,7 +4490,7 @@ maintainer-clean:
-rm -f gcc.??s gcc.*aux
-rm -f $(gcc_docdir)/*.info $(gcc_docdir)/*.1 $(gcc_docdir)/*.7 $(gcc_docdir)/*.dvi $(gcc_docdir)/*.pdf
#
# Entry points `install' and `uninstall'.
# Entry points `install', `install-strip', and `uninstall'.
# Also use `install-collect2' to install collect2 when the config files don't.
# Copy the compiler files into directories where they will be run.
@ -4502,6 +4504,13 @@ ifeq ($(enable_plugin),yes)
install: install-plugin
endif
install-strip: override INSTALL_PROGRAM = $(INSTALL_STRIP_PROGRAM)
ifneq ($(STRIP),)
install-strip: STRIPPROG = $(STRIP)
export STRIPPROG
endif
install-strip: install
# Handle cpp installation.
install-cpp: installdirs cpp$(exeext)
-rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext)

View File

@ -92,7 +92,7 @@ SHLIB_LINK = $(LN_S) -f $(SHLIB_MAP) $(SHLIB_MAP).def && \
# libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = \
$$(mkinstalldirs) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
$(INSTALL_PROGRAM) $(SHLIB_DIR)/$(SHLIB_SONAME) \
$(INSTALL) $(SHLIB_DIR)/$(SHLIB_SONAME) \
$$(DESTDIR)$$(bindir)/$(SHLIB_SONAME); \
$(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_IMPLIB) \
$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_IMPLIB)

View File

@ -2617,7 +2617,7 @@ messages may be automatically processed.
Now that GCC has been built (and optionally tested), you can install it with
@smallexample
cd @var{objdir}; make install
cd @var{objdir} && make install
@end smallexample
We strongly recommend to install into a target directory where there is
@ -2653,7 +2653,8 @@ jail can be achieved with the command
make DESTDIR=@var{path-to-rootdir} install
@end smallexample
@noindent where @var{path-to-rootdir} is the absolute path of
@noindent
where @var{path-to-rootdir} is the absolute path of
a directory relative to which all installation paths will be
interpreted. Note that the directory specified by @code{DESTDIR}
need not exist yet; it will be created if necessary.
@ -2667,6 +2668,12 @@ it will not be created otherwise. This is regarded as a feature,
not as a bug, because it gives slightly more control to the packagers
using the @code{DESTDIR} feature.
You can install stripped programs and libraries with
@smallexample
make install-strip
@end smallexample
If you are bootstrapping a released version of GCC then please
quickly review the build status page for your release, available from
@uref{http://gcc.gnu.org/buildstat.html}.

View File

@ -1,3 +1,11 @@
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR other/46202
* Makefile.in (install-strip): New phony target.
(check, installcheck, info, dvi, pdf, html, install)
(install-info, install-pdf, install-html, mostlyclean)
(clean, distclean, maintainer-clean): Mark phony.
2010-01-09 Simon Wright <simon@pushface.org>
PR ada/42659

View File

@ -1,5 +1,5 @@
# Makefile for gnattools
# Copyright 2003, 2004, 2009 Free Software Foundation, Inc.
# Copyright 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -274,18 +274,24 @@ pdf:
# Build HTML (none here).
html:
.PHONY: check installcheck info dvi pdf html
# Build TAGS (none here).
TAGS:
# Installation rules.
install:
install-strip: install
install-info:
install-pdf:
install-html:
.PHONY: install install-strip install-info install-pdf install-html
# Cleaning rules.
mostlyclean:
@ -296,6 +302,8 @@ distclean:
maintainer-clean:
.PHONY: mostlyclean clean distclean maintainer-clean
# Rules for rebuilding this Makefile.
Makefile: $(srcdir)/Makefile.in config.status
CONFIG_FILES=$@ ; \

View File

@ -1,3 +1,11 @@
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR other/46202
* Makefile.in (install-strip): New phony target.
(check, installcheck, info, dvi, pdf, html, install)
(install-info, install-pdf, install-html, mostlyclean)
(clean, distclean, maintainer-clean): Mark phony.
2009-10-24 Eric Botcazou <ebotcazou@adacore.com>
* Makefile.in (GNATLIBCFLAGS_FOR_C): New variable.

View File

@ -1,5 +1,5 @@
# Makefile for libada.
# Copyright 2003, 2004, 2009 Free Software Foundation, Inc.
# Copyright 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@
all: gnatlib
$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
.PHONY: all install
.PHONY: all
## Multilib support variables.
MULTISRCTOP =
@ -144,16 +144,22 @@ html:
# Build TAGS (none here).
TAGS:
.PHONY: check installcheck info dvi pdf html
# Installation rules.
install: install-gnatlib
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
install-strip: install
install-info:
install-pdf:
install-html:
.PHONY: install install-strip install-info install-pdf install-html
# Cleaning rules.
mostlyclean:
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
@ -167,6 +173,8 @@ distclean:
maintainer-clean:
.PHONY: mostlyclean clean distclean maintainer-clean
# Rules for rebuilding this Makefile.
Makefile: $(srcdir)/Makefile.in config.status
CONFIG_FILES=$@ ; \

View File

@ -1,3 +1,8 @@
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR other/46202
* Makefile.in (install-strip): New phony target.
2010-11-07 Ian Lance Taylor <iant@google.com>
PR target/46089

View File

@ -1,6 +1,6 @@
# Makefile.in
# Copyright (C) 2005, 2006, 2009 Free Software Foundation
# Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation
#
# This file is part of GCC.
#
@ -975,7 +975,9 @@ install-leaf: $(install-shared) $(install-libunwind)
install: install-leaf
@: $(MAKE) ; $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
.PHONY: install install-shared install-libunwind
install-strip: install
.PHONY: install install-shared install-libunwind install-strip
# Don't export variables to the environment, in order to not confuse
# configure.

View File

@ -1,3 +1,9 @@
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR other/46202
* Makefile.in (install-strip): New phony target.
(install): Also mark as phony.
2010-11-16 Ian Lance Taylor <iant@google.com>
* simple-object.c (simple_object_attributes_merge): Rename from

View File

@ -341,6 +341,9 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC)
INSTALL_DEST = @INSTALL_DEST@
install: install_to_$(INSTALL_DEST) install-subdir
install-strip: install
.PHONY: install install-strip
# This is tricky. Even though CC in the Makefile contains
# multilib-specific flags, it's overridden by FLAGS_TO_PASS from the