From: Ilya Palachev Date: Thu, 14 May 2015 11:53:50 +0000 (+0300) Subject: Revert "rename info files" X-Git-Tag: accepted/tizen/3.0.2015.q2/common/20150615.160009~20^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd81fb291c28f3d62649d4bf9835792d0c0aca77;p=platform%2Fupstream%2Fgcc49.git Revert "rename info files" This reverts commit d172df8002c87b7cd6a1cd91b33b106ca0c49d20. This patch fixes the bootstrap failure. If you perform the followinf actions: mkdir build cd build ../configure make the build will fail with the following error: cp libgomp.info libgomp.info make all-recursive cp: `libgomp.info' and `libgomp.info' are the same file Thus it seems that it would be better to revert the patch that is not included to upstream. Also the packagin section in spec-file was modified in order to fit proper names of info files. Change-Id: I1a053f7644902825e76a6ff4a2b4651830d373bb Signed-off-by: Ilya Palachev --- diff --git a/gcc/Makefile.in b/gcc/Makefile.in index bd6dbaa..68a5ace 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2786,27 +2786,8 @@ install-no-fixedincludes: doc: $(BUILD_INFO) $(GENERATED_MANPAGES) -INFO_CPP_NAME = $(shell echo cpp|sed '$(program_transform_name)') -INFO_GCC_NAME = $(shell echo gcc|sed '$(program_transform_name)') -INFO_GXX_NAME = $(shell echo g++|sed '$(program_transform_name)') -INFO_GCCINT_NAME = $(shell echo gccint|sed '$(program_transform_name)') -INFO_GCCINSTALL_NAME = $(shell echo gccinstall|sed '$(program_transform_name)') -INFO_CPPINT_NAME = $(shell echo cppinternals|sed '$(program_transform_name)') - -INFO_FORTRAN_NAME = $(shell echo gfortran|sed '$(program_transform_name)') -INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)') - -INFOFILES = doc/$(INFO_CPP_NAME).info doc/$(INFO_GCC_NAME).info \ - doc/$(INFO_GCCINT_NAME).info \ - doc/$(INFO_GCCINSTALL_NAME).info doc/$(INFO_CPPINT_NAME).info - -MAKEINFODEFS = -D 'fncpp $(INFO_CPP_NAME)' -D 'fngcc $(INFO_GCC_NAME)' \ - -D 'fngxx $(INFO_GXX_NAME)' \ - -D 'fngccint $(INFO_GCCINT_NAME)' \ - -D 'fngccinstall $(INFO_GCCINSTALL_NAME)' \ - -D 'fncppint $(INFO_CPPINT_NAME)' \ - -D 'fngfortran $(INFO_FORTRAN_NAME)' \ - -D 'fngcj $(INFO_GCJ_NAME)' +INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \ + doc/gccinstall.info doc/cppinternals.info info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo @@ -2861,41 +2842,21 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE) # patterns. To use them, put each of the specific targets with its # specific dependencies but no build commands. -# Generic entry to handle info files, which are not renamed (currently Ada) +doc/cpp.info: $(TEXI_CPP_FILES) +doc/gcc.info: $(TEXI_GCC_FILES) +doc/gccint.info: $(TEXI_GCCINT_FILES) +doc/cppinternals.info: $(TEXI_CPPINT_FILES) + doc/%.info: %.texi if [ x$(BUILD_INFO) = xinfo ]; then \ $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \ -I $(gcc_docdir)/include -o $@ $<; \ fi -doc/$(INFO_CPP_NAME).info: $(TEXI_CPP_FILES) - if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ - -I $(gcc_docdir)/include -o $@ $<; \ - fi - -doc/$(INFO_GCC_NAME).info: $(TEXI_GCC_FILES) - if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ - -I $(gcc_docdir)/include -o $@ $<; \ - fi - -doc/$(INFO_GCCINT_NAME).info: $(TEXI_GCCINT_FILES) - if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ - -I $(gcc_docdir)/include -o $@ $<; \ - fi - -doc/$(INFO_CPPINT_NAME).info: $(TEXI_CPPINT_FILES) - if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ - -I $(gcc_docdir)/include -o $@ $<; \ - fi - # Duplicate entry to handle renaming of gccinstall.info -doc/$(INFO_GCCINSTALL_NAME).info: $(TEXI_GCCINSTALL_FILES) +doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES) if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ + $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \ -I $(gcc_docdir)/include -o $@ $<; \ fi @@ -3273,11 +3234,11 @@ install-driver: installdirs xgcc$(exeext) # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir # to do the install. install-info:: doc installdirs \ - $(DESTDIR)$(infodir)/$(INFO_CPP_NAME).info \ - $(DESTDIR)$(infodir)/$(INFO_GCC_NAME).info \ - $(DESTDIR)$(infodir)/$(INFO_CPPINT_NAME).info \ - $(DESTDIR)$(infodir)/$(INFO_GCCINSTALL_NAME).info \ - $(DESTDIR)$(infodir)/$(INFO_GCCINT_NAME).info \ + $(DESTDIR)$(infodir)/cpp.info \ + $(DESTDIR)$(infodir)/gcc.info \ + $(DESTDIR)$(infodir)/cppinternals.info \ + $(DESTDIR)$(infodir)/gccinstall.info \ + $(DESTDIR)$(infodir)/gccint.info \ lang.install-info $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs @@ -3484,11 +3445,8 @@ uninstall: lang.uninstall -rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext) -rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext) - -rm -f $(DESTDIR)$(infodir)/$(INFO_CPP_NAME).info* - -rm -f $(DESTDIR)$(infodir)/$(INFO_GCC_NAME).info* - -rm -f $(DESTDIR)$(infodir)/$(INFO_CPPINT_NAME).info* - -rm -f $(DESTDIR)$(infodir)/$(INFO_GCCINT_NAME).info* - -rm -f $(DESTDIR)$(infodir)/$(INFO_GCCINSTALL_NAME).info* + -rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info* + -rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info* for i in ar nm ranlib ; do \ install_name=`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ;\ target_install_name=$(target_noncanonical)-`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ; \ diff --git a/gcc/ada/gnat-style.texi b/gcc/ada/gnat-style.texi index 6b26d11..df2d491 100644 --- a/gcc/ada/gnat-style.texi +++ b/gcc/ada/gnat-style.texi @@ -31,7 +31,7 @@ Texts. A copy of the license is included in the section entitled @dircategory Software development @direntry -* gnat-style: (gnat-style-4.9). GNAT Coding Style +* gnat-style: (gnat-style). GNAT Coding Style @end direntry @macro syntax{element} diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi index 7019262..138551d 100644 --- a/gcc/ada/gnat_rm.texi +++ b/gcc/ada/gnat_rm.texi @@ -36,7 +36,7 @@ included in the section entitled ``GNU Free Documentation License''. @dircategory GNU Ada tools @direntry -* GNAT Reference Manual: (gnat_rm-4.9). Reference Manual for GNU Ada tools. +* GNAT Reference Manual: (gnat_rm). Reference Manual for GNU Ada tools. @end direntry @titlepage diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index ca928b6..b484665 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -118,7 +118,7 @@ Texts. A copy of the license is included in the section entitled @settitle @value{EDITION} User's Guide @value{TITLESUFFIX} @dircategory GNU Ada tools @direntry -* @value{EDITION} User's Guide: (gnat_ugn-4.9). @value{PLATFORM} +* @value{EDITION} User's Guide: (gnat_ugn). @value{PLATFORM} @end direntry @include gcc-common.texi diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi index d50ba2c..0a6e50c 100644 --- a/gcc/doc/cpp.texi +++ b/gcc/doc/cpp.texi @@ -50,7 +50,7 @@ This manual contains no Invariant Sections. The Front-Cover Texts are @ifinfo @dircategory Software development @direntry -* @value{fncpp}: (@value{fncpp}). The GNU C preprocessor. +* Cpp: (cpp). The GNU C preprocessor. @end direntry @end ifinfo diff --git a/gcc/doc/cppinternals.texi b/gcc/doc/cppinternals.texi index be998ca..8b329d6 100644 --- a/gcc/doc/cppinternals.texi +++ b/gcc/doc/cppinternals.texi @@ -7,7 +7,7 @@ @ifinfo @dircategory Software development @direntry -* @value{fncppint}: (@value{fncppint}). Cpplib internals. +* Cpplib: (cppinternals). Cpplib internals. @end direntry @end ifinfo diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index 4c64a40..10ad6e4 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -17106,7 +17106,7 @@ want to write code that checks whether these features are available, you can test for the GNU compiler the same way as for C programs: check for a predefined macro @code{__GNUC__}. You can also use @code{__GNUG__} to test specifically for GNU C++ (@pxref{Common Predefined Macros,, -Predefined Macros,@value{fncpp},The GNU C Preprocessor}). +Predefined Macros,cpp,The GNU C Preprocessor}). @menu * C++ Volatiles:: What constitutes an access to a volatile object. diff --git a/gcc/doc/gcc.texi b/gcc/doc/gcc.texi index f9c9d97..c1f3857 100644 --- a/gcc/doc/gcc.texi +++ b/gcc/doc/gcc.texi @@ -63,9 +63,9 @@ Texts being (a) (see below), and with the Back-Cover Texts being (b) @ifnottex @dircategory Software development @direntry -* @value{fngcc}: (@value{fngcc}). The GNU Compiler Collection. -* @value{fngxx}: (@value{fngxx}). The GNU C++ compiler. -* gcov: (@value{fngcc}) Gcov. @command{gcov}---a test coverage program. +* gcc: (gcc). The GNU Compiler Collection. +* g++: (gcc). The GNU C++ compiler. +* gcov: (gcc) Gcov. @command{gcov}---a test coverage program. @end direntry This file documents the use of the GNU compilers. @sp 1 @@ -125,7 +125,7 @@ version @value{version-GCC}. The internals of the GNU compilers, including how to port them to new targets and some information about how to write front ends for new languages, are documented in a separate manual. @xref{Top,, -Introduction, @value{fngccint}, GNU Compiler Collection (GCC) Internals}. +Introduction, gccint, GNU Compiler Collection (GCC) Internals}. @menu * G++ and GCC:: You can compile C or C++ programs. diff --git a/gcc/doc/gccint.texi b/gcc/doc/gccint.texi index b9bffa2..889f410 100644 --- a/gcc/doc/gccint.texi +++ b/gcc/doc/gccint.texi @@ -49,7 +49,7 @@ Texts being (a) (see below), and with the Back-Cover Texts being (b) @ifnottex @dircategory Software development @direntry -* @value{fngccint}: (@value{fngccint}). Internals of the GNU Compiler Collection. +* gccint: (gccint). Internals of the GNU Compiler Collection. @end direntry This file documents the internals of the GNU compilers. @sp 1 @@ -81,7 +81,7 @@ write front ends for new languages. It corresponds to the compilers @value{VERSION_PACKAGE} @end ifset version @value{version-GCC}. The use of the GNU compilers is documented in a -separate manual. @xref{Top,, Introduction, @value{fngcc}, Using the GNU +separate manual. @xref{Top,, Introduction, gcc, Using the GNU Compiler Collection (GCC)}. This manual is mainly a reference manual rather than a tutorial. It diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index d6f66a5..1daedff 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -94,7 +94,7 @@ Free Documentation License}''. @end ifinfo @dircategory Software development @direntry -* @value{fngccinstall}: (@value{fngccinstall}). Installing the GNU Compiler Collection. +* gccinstall: (gccinstall). Installing the GNU Compiler Collection. @end direntry @c Part 3 Titlepage and Copyright diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index f0f5be1..bea8be2 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -6979,7 +6979,7 @@ the standard calling sequence automatically handles the frame pointer and nothing is saved by pretending it doesn't exist. The machine-description macro @code{FRAME_POINTER_REQUIRED} controls whether a target machine supports this flag. @xref{Registers,,Register -Usage, @value{fngccint}, GNU Compiler Collection (GCC) Internals}. +Usage, gccint, GNU Compiler Collection (GCC) Internals}. Starting with GCC version 4.6, the default setting (when not optimizing for size) for 32-bit GNU/Linux x86 and 32-bit Darwin x86 targets has been changed to @@ -10331,7 +10331,7 @@ One of the standard libraries bypassed by @option{-nostdlib} and @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines which GCC uses to overcome shortcomings of particular machines, or special needs for some languages. -(@xref{Interface,,Interfacing to GCC Output,@value{fngccint},GNU Compiler +(@xref{Interface,,Interfacing to GCC Output,gccint,GNU Compiler Collection (GCC) Internals}, for more discussion of @file{libgcc.a}.) In most cases, you need @file{libgcc.a} even when you want to avoid @@ -10340,7 +10340,7 @@ or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well. This ensures that you have no unresolved references to internal GCC library subroutines. (An example of such an internal subroutine is @samp{__main}, used to ensure C++ -constructors are called; @pxref{Collect2,,@code{collect2}, @value{fngccint}, +constructors are called; @pxref{Collect2,,@code{collect2}, gccint, GNU Compiler Collection (GCC) Internals}.) @item -pie @@ -22724,7 +22724,7 @@ Note that you can also specify places to search using options such as @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}). These take precedence over places specified using environment variables, which in turn take precedence over those specified by the configuration of GCC@. -@xref{Driver,, Controlling the Compilation Driver @file{gcc}, @value{fngccint}, +@xref{Driver,, Controlling the Compilation Driver @file{gcc}, gccint, GNU Compiler Collection (GCC) Internals}. @table @env @@ -22884,7 +22884,7 @@ the headers it contains change. A precompiled header file is searched for when @code{#include} is seen in the compilation. As it searches for the included file -(@pxref{Search Path,,Search Path,@value{fncpp},The C Preprocessor}) the +(@pxref{Search Path,,Search Path,cpp,The C Preprocessor}) the compiler looks for a precompiled header in each directory just before it looks for the include file in that directory. The name searched for is the name specified in the @code{#include} with @samp{.gch} appended. If diff --git a/gcc/doc/libgcc.texi b/gcc/doc/libgcc.texi index 5f70201..0dd2ff7 100644 --- a/gcc/doc/libgcc.texi +++ b/gcc/doc/libgcc.texi @@ -24,7 +24,7 @@ that needs them. GCC will also generate calls to C library routines, such as @code{memcpy} and @code{memset}, in some cases. The set of routines that GCC may possibly use is documented in @ref{Other -Builtins,,,@value{fngcc}, Using the GNU Compiler Collection (GCC)}. +Builtins,,,gcc, Using the GNU Compiler Collection (GCC)}. These routines take arguments and return values of a specific machine mode, not a specific C type. @xref{Machine Modes}, for an explanation diff --git a/gcc/doc/makefile.texi b/gcc/doc/makefile.texi index 436330f..18b1c68 100644 --- a/gcc/doc/makefile.texi +++ b/gcc/doc/makefile.texi @@ -139,7 +139,7 @@ regardless of how it itself was compiled. Builds a compiler with profiling feedback information. In this case, the second and third stages are named @samp{profile} and @samp{feedback}, respectively. For more information, see -@ref{Building,,Building with profile feedback,@value{fngccinstall},Installing GCC}. +@ref{Building,,Building with profile feedback,gccinstall,Installing GCC}. @item restrap Restart a bootstrap, so that everything that was not built with diff --git a/gcc/doc/standards.texi b/gcc/doc/standards.texi index 970357d..f5744c8 100644 --- a/gcc/doc/standards.texi +++ b/gcc/doc/standards.texi @@ -288,8 +288,8 @@ described at @uref{http://golang.org/doc/go1.html}. GNAT Reference Manual}, for information on standard conformance and compatibility of the Ada compiler. -@xref{Standards,,Standards, @value{fngfortran}, The GNU Fortran Compiler}, for details +@xref{Standards,,Standards, gfortran, The GNU Fortran Compiler}, for details of standards supported by GNU Fortran. -@xref{Compatibility,,Compatibility with the Java Platform, @value{fngcj}, GNU gcj}, +@xref{Compatibility,,Compatibility with the Java Platform, gcj, GNU gcj}, for details of compatibility between @command{gcj} and the Java Platform. diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index d2ee321..f8287bd 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -114,8 +114,7 @@ fortran.tags: force cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \ etags --include TAGS.sub --include ../TAGS.sub -INFO_FORTRAN_NAME = $(shell echo gfortran|sed '$(program_transform_name)') -fortran.info: doc/$(INFO_FORTRAN_NAME).info +fortran.info: doc/gfortran.info doc/gfc-internals.info fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi F95_HTMLFILES = $(build_htmldir)/gfortran @@ -187,10 +186,10 @@ GFORTRAN_TEXI = \ $(srcdir)/doc/include/gcc-common.texi \ gcc-vers.texi -doc/$(INFO_FORTRAN_NAME).info: $(GFORTRAN_TEXI) +doc/gfortran.info: $(GFORTRAN_TEXI) if [ x$(BUILD_INFO) = xinfo ]; then \ rm -f doc/gfortran.info-*; \ - $(MAKEINFO) $(MAKEINFODEFS) -I $(srcdir)/doc/include -I $(srcdir)/fortran \ + $(MAKEINFO) -I $(srcdir)/doc/include -I $(srcdir)/fortran \ -o $@ $<; \ else true; fi @@ -253,7 +252,7 @@ fortran.install-common: install-finclude-dir installdirs fortran.install-plugin: -fortran.install-info: $(DESTDIR)$(infodir)/$(INFO_FORTRAN_NAME).info +fortran.install-info: $(DESTDIR)$(infodir)/gfortran.info fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext) @@ -271,7 +270,7 @@ fortran.uninstall: rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \ rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ - rm -rf $(DESTDIR)$(infodir)/$(INFO_FORTRAN_NAME).info* + rm -rf $(DESTDIR)$(infodir)/gfortran.info* # # Clean hooks: diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi index a53c415..c852b3a 100644 --- a/gcc/fortran/gfortran.texi +++ b/gcc/fortran/gfortran.texi @@ -101,7 +101,7 @@ Texts being (a) (see below), and with the Back-Cover Texts being (b) @ifinfo @dircategory Software development @direntry -* @value{fngfortran}: (@value{fngfortran}). The GNU Fortran Compiler. +* gfortran: (gfortran). The GNU Fortran Compiler. @end direntry This file documents the use and the internals of the GNU Fortran compiler, (@command{gfortran}). diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index d95d807..d23a39f 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -122,23 +122,11 @@ java.tags: force etags --include TAGS.sub --include ../TAGS.sub -TEXI_GCJ_FILES = java/gcj.texi \ - $(gcc_docdir)/include/gpl_v3.texi $(gcc_docdir)/include/funding.texi \ - $(gcc_docdir)/include/fdl.texi $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi -INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)') +java.info: doc/gcj.info -java.info: doc/$(INFO_GCJ_NAME).info - -java.srcinfo: doc/$(INFO_GCJ_NAME).info +java.srcinfo: doc/gcj.info -cp -p $^ $(srcdir)/doc -doc/$(INFO_GCJ_NAME).info: $(TEXI_GCJ_FILES) - if test "x$(BUILD_INFO)" = xinfo; then \ - rm -f $(@)*; \ - $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) \ - -I$(gcc_docdir)/include -I$(srcdir)/f -o$@ $<; \ - fi - java.dvi: doc/gcj.dvi JAVA_PDFFILES = doc/gcj.pdf @@ -201,9 +189,8 @@ java.uninstall: -rm -rf $(DESTDIR)$(man1dir)/gcj-dbtool$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/aot-compile$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/rebuild-gcj-db$(man1ext) - -rm -f $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info* -java.install-info: $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info +java.install-info: $(DESTDIR)$(infodir)/gcj.info java.install-pdf: $(JAVA_PDFFILES) @$(NORMAL_INSTALL) diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi index 7e13324..eb5472a 100644 --- a/gcc/java/gcj.texi +++ b/gcc/java/gcj.texi @@ -55,25 +55,25 @@ man page gfdl(7). @format @dircategory Software development @direntry -* @value{fngcj}: (@value{fngcj}). Ahead-of-time compiler for the Java language +* Gcj: (gcj). Ahead-of-time compiler for the Java language @end direntry @dircategory Individual utilities @direntry -* jcf-dump: (@value{fngcj}) Invoking jcf-dump. +* jcf-dump: (gcj)Invoking jcf-dump. Print information about Java class files -* gij: (@value{fngcj}) Invoking gij. GNU interpreter for Java bytecode -* gcj-dbtool: (@value{fngcj}) Invoking gcj-dbtool. +* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode +* gcj-dbtool: (gcj)Invoking gcj-dbtool. Tool for manipulating class file databases. -* jv-convert: (@value{fngcj}) Invoking jv-convert. +* jv-convert: (gcj)Invoking jv-convert. Convert file from one encoding to another -* grmic: (@value{fngcj}) Invoking grmic. +* grmic: (gcj)Invoking grmic. Generate stubs for Remote Method Invocation. -* gc-analyze: (@value{fngcj}) Invoking gc-analyze. +* gc-analyze: (gcj)Invoking gc-analyze. Analyze Garbage Collector (GC) memory dumps. -* aot-compile: (@value{fngcj})Invoking aot-compile. +* aot-compile: (gcj)Invoking aot-compile. Compile bytecode to native and generate databases. -* rebuild-gcj-db: (@value{fngcj})Invoking rebuild-gcj-db. +* rebuild-gcj-db: (gcj)Invoking rebuild-gcj-db. Merge the per-solib databases made by aot-compile into one system-wide database. @end direntry @@ -159,7 +159,7 @@ and the Info entries for @file{gcj} and @file{gcc}. As @command{gcj} is just another front end to @command{gcc}, it supports many of the same options as gcc. @xref{Option Summary, , Option Summary, -@value{fngcc}, Using the GNU Compiler Collection (GCC)}. This manual only documents the +gcc, Using the GNU Compiler Collection (GCC)}. This manual only documents the options specific to @command{gcj}. @c man end diff --git a/libffi/Makefile.am b/libffi/Makefile.am index 8ef1048..645dc12 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -52,8 +52,6 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex # Defines info, dvi, pdf and html targets MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include info_TEXINFOS = doc/libffi.texi -INFO_LIBFFI_NAME = $(shell echo libffi | sed '${program_transform_name}') -INFO_DEPS = doc/$(INFO_LIBFFI_NAME).info # AM_CONDITIONAL on configure option --generated-files-in-srcdir if GENINSRC @@ -71,19 +69,18 @@ endif all-local: $(STAMP_GENINSRC) -$(srcdir)/doc/libffi.info: stamp-geninsrc -stamp-geninsrc: doc/$(INFO_LIBFFI_NAME).info - cp -p $(top_builddir)/doc/$(INFO_LIBFFI_NAME).info $(srcdir)/doc/libffi.info +stamp-geninsrc: doc/libffi.info + cp -p $(top_builddir)/doc/libffi.info $(srcdir)/doc/libffi.info @touch $@ -doc/$(INFO_LIBFFI_NAME).info: $(STAMP_BUILD_INFO) +doc/libffi.info: $(STAMP_BUILD_INFO) stamp-build-info: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibffi $(INFO_LIBFFI_NAME)' -I $(srcdir)/doc -o doc/$(INFO_LIBFFI_NAME).info $(srcdir)/doc/libffi.texi + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)/doc -o doc/libffi.info $(srcdir)/doc/libffi.texi @touch $@ -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) doc/$(INFO_LIBFFI_NAME).info +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) doc/libffi.info MAINTAINERCLEANFILES = $(srcdir)/doc/libffi.info ## ################################################################ diff --git a/libffi/Makefile.in b/libffi/Makefile.in index f9d9c25..2a04e0b 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -223,6 +223,7 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true +INFO_DEPS = doc/libffi.info am__TEXINFO_TEX_DIR = $(srcdir)/../gcc/doc/include DVIS = doc/libffi.dvi PDFS = doc/libffi.pdf @@ -428,8 +429,6 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex # Defines info, dvi, pdf and html targets MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include info_TEXINFOS = doc/libffi.texi -INFO_LIBFFI_NAME = $(shell echo libffi | sed '${program_transform_name}') -INFO_DEPS = doc/$(INFO_LIBFFI_NAME).info @GENINSRC_FALSE@STAMP_GENINSRC = # AM_CONDITIONAL on configure option --generated-files-in-srcdir @@ -438,7 +437,7 @@ INFO_DEPS = doc/$(INFO_LIBFFI_NAME).info # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) doc/$(INFO_LIBFFI_NAME).info +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) doc/libffi.info MAINTAINERCLEANFILES = $(srcdir)/doc/libffi.info # Work around what appears to be a GNU make bug handling MAKEFLAGS @@ -1684,15 +1683,14 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ all-local: $(STAMP_GENINSRC) -$(srcdir)/doc/libffi.info: stamp-geninsrc -stamp-geninsrc: doc/$(INFO_LIBFFI_NAME).info - cp -p $(top_builddir)/doc/$(INFO_LIBFFI_NAME).info $(srcdir)/doc/libffi.info +stamp-geninsrc: doc/libffi.info + cp -p $(top_builddir)/doc/libffi.info $(srcdir)/doc/libffi.info @touch $@ -doc/$(INFO_LIBFFI_NAME).info: $(STAMP_BUILD_INFO) +doc/libffi.info: $(STAMP_BUILD_INFO) stamp-build-info: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibffi $(INFO_LIBFFI_NAME)' -I $(srcdir)/doc -o doc/$(INFO_LIBFFI_NAME).info $(srcdir)/doc/libffi.texi + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)/doc -o doc/libffi.info $(srcdir)/doc/libffi.texi @touch $@ # Multilib support. Automake should provide these on its own. diff --git a/libffi/doc/libffi.texi b/libffi/doc/libffi.texi index 067fb89..04888ec 100644 --- a/libffi/doc/libffi.texi +++ b/libffi/doc/libffi.texi @@ -33,7 +33,7 @@ section entitled ``GNU General Public License''. @dircategory Development @direntry -* libffi: (@value{fnlibffi}). Portable foreign-function interface library. +* libffi: (libffi). Portable foreign-function interface library. @end direntry @titlepage diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index 5900644..427415e 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -111,19 +111,16 @@ endif all-local: $(STAMP_GENINSRC) -INFO_LIBGOMP_NAME = $(shell echo libgomp|sed '$(program_transform_name)') -stamp-geninsrc: $(INFO_LIBGOMP_NAME).info - cp -p $(top_builddir)/$(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.info +stamp-geninsrc: libgomp.info + cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info @touch $@ -libgomp.info: $(INFO_LIBGOMP_NAME).info - cp $(INFO_LIBGOMP_NAME).info libgomp.info -$(INFO_LIBGOMP_NAME).info: $(STAMP_BUILD_INFO) +libgomp.info: $(STAMP_BUILD_INFO) stamp-build-info: libgomp.texi - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibgomp $(INFO_LIBGOMP_NAME)' -I $(srcdir) -o $(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.texi + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi @touch $@ -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) $(INFO_LIBGOMP_NAME).info +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info MAINTAINERCLEANFILES = $(srcdir)/libgomp.info diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index a62b7fc..5cd666f 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -345,8 +345,7 @@ info_TEXINFOS = libgomp.texi # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info -INFO_LIBGOMP_NAME = $(shell echo libgomp|sed '$(program_transform_name)') -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) $(INFO_LIBGOMP_NAME).info +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info MAINTAINERCLEANFILES = $(srcdir)/libgomp.info all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1094,16 +1093,15 @@ env.lo: libgomp_f.h env.o: libgomp_f.h all-local: $(STAMP_GENINSRC) -stamp-geninsrc: $(INFO_LIBGOMP_NAME).info - cp -p $(top_builddir)/$(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.info + +stamp-geninsrc: libgomp.info + cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info @touch $@ -libgomp.info: $(INFO_LIBGOMP_NAME).info - cp $(INFO_LIBGOMP_NAME).info libgomp.info -$(INFO_LIBGOMP_NAME).info: $(STAMP_BUILD_INFO) +libgomp.info: $(STAMP_BUILD_INFO) stamp-build-info: libgomp.texi - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibgomp $(INFO_LIBGOMP_NAME)' -I $(srcdir) -o $(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.texi + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi @touch $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi index 0ae4f64..254be57 100644 --- a/libgomp/libgomp.texi +++ b/libgomp/libgomp.texi @@ -31,7 +31,7 @@ texts being (a) (see below), and with the Back-Cover Texts being (b) @ifinfo @dircategory GNU Libraries @direntry -* @value{fnlibgomp}: (@value{fnlibgomp}). GNU OpenMP runtime library +* libgomp: (libgomp). GNU OpenMP runtime library @end direntry This manual documents the GNU implementation of the OpenMP API for diff --git a/libitm/libitm.texi b/libitm/libitm.texi index 53f36a6..08776f3 100644 --- a/libitm/libitm.texi +++ b/libitm/libitm.texi @@ -20,7 +20,7 @@ Free Documentation License''. @ifinfo @dircategory GNU Libraries @direntry -* libitm: (libitm-4.9). GNU Transactional Memory Library +* libitm: (libitm). GNU Transactional Memory Library @end direntry This manual documents the GNU Transactional Memory Library. diff --git a/libquadmath/libquadmath.texi b/libquadmath/libquadmath.texi index 9a7944c..c9ebf6a 100644 --- a/libquadmath/libquadmath.texi +++ b/libquadmath/libquadmath.texi @@ -25,7 +25,7 @@ copy and modify this GNU manual. @ifinfo @dircategory GNU Libraries @direntry -* libquadmath: (libquadmath-4.9). GCC Quad-Precision Math Library +* libquadmath: (libquadmath). GCC Quad-Precision Math Library @end direntry This manual documents the GCC Quad-Precision Math Library API. diff --git a/packaging/gcc.spec.in b/packaging/gcc.spec.in index 34e4776..e5ab747 100644 --- a/packaging/gcc.spec.in +++ b/packaging/gcc.spec.in @@ -2281,28 +2281,28 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %files info %defattr(-,root,root) -%doc %{_infodir}/cpp%{binsuffix}.info*.gz -%doc %{_infodir}/cppinternals%{binsuffix}.info*.gz -%doc %{_infodir}/gcc%{binsuffix}.info*.gz -%doc %{_infodir}/gccint%{binsuffix}.info*.gz -%doc %{_infodir}/gccinstall%{binsuffix}.info*.gz +%doc %{_infodir}/cpp.info*.gz +%doc %{_infodir}/cppinternals.info*.gz +%doc %{_infodir}/gcc.info*.gz +%doc %{_infodir}/gccint.info*.gz +%doc %{_infodir}/gccinstall.info*.gz %doc %{_infodir}/libgomp%{binsuffix}.info*.gz %ifarch %itm_arch %doc %{_infodir}/libitm%{binsuffix}.info*.gz %endif %if %{build_fortran} -%doc %{_infodir}/gfortran%{binsuffix}.info*.gz +%doc %{_infodir}/gfortran.info*.gz %ifarch %quadmath_arch %doc %{_infodir}/libquadmath%{binsuffix}.info*.gz %endif %endif %if %{build_java} -%doc %{_infodir}/gcj%{binsuffix}.info*.gz +%doc %{_infodir}/gcj.info*.gz %endif %if %{build_ada} -%doc %{_infodir}/gnat-style%{binsuffix}.info*gz -%doc %{_infodir}/gnat_rm%{binsuffix}.info*gz -%doc %{_infodir}/gnat_ugn%{binsuffix}.info*gz +%doc %{_infodir}/gnat-style.info*gz +%doc %{_infodir}/gnat_rm.info*gz +%doc %{_infodir}/gnat_ugn.info*gz %endif %files -n cpp@base_ver@ diff --git a/packaging/gcc49.spec b/packaging/gcc49.spec index fb8e2cf..f7d540b 100644 --- a/packaging/gcc49.spec +++ b/packaging/gcc49.spec @@ -2800,28 +2800,28 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc49-locale.lang %files info %defattr(-,root,root) -%doc %{_infodir}/cpp%{binsuffix}.info*.gz -%doc %{_infodir}/cppinternals%{binsuffix}.info*.gz -%doc %{_infodir}/gcc%{binsuffix}.info*.gz -%doc %{_infodir}/gccint%{binsuffix}.info*.gz -%doc %{_infodir}/gccinstall%{binsuffix}.info*.gz +%doc %{_infodir}/cpp.info*.gz +%doc %{_infodir}/cppinternals.info*.gz +%doc %{_infodir}/gcc.info*.gz +%doc %{_infodir}/gccint.info*.gz +%doc %{_infodir}/gccinstall.info*.gz %doc %{_infodir}/libgomp%{binsuffix}.info*.gz %ifarch %itm_arch %doc %{_infodir}/libitm%{binsuffix}.info*.gz %endif %if %{build_fortran} -%doc %{_infodir}/gfortran%{binsuffix}.info*.gz +%doc %{_infodir}/gfortran.info*.gz %ifarch %quadmath_arch %doc %{_infodir}/libquadmath%{binsuffix}.info*.gz %endif %endif %if %{build_java} -%doc %{_infodir}/gcj%{binsuffix}.info*.gz +%doc %{_infodir}/gcj.info*.gz %endif %if %{build_ada} -%doc %{_infodir}/gnat-style%{binsuffix}.info*gz -%doc %{_infodir}/gnat_rm%{binsuffix}.info*gz -%doc %{_infodir}/gnat_ugn%{binsuffix}.info*gz +%doc %{_infodir}/gnat-style.info*gz +%doc %{_infodir}/gnat_rm.info*gz +%doc %{_infodir}/gnat_ugn.info*gz %endif %files -n cpp49