Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gcc/dist Resolve conflicts



details:   https://anonhg.NetBSD.org/src/rev/823e9d2bc7fb
branches:  trunk
changeset: 796257:823e9d2bc7fb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue May 27 09:18:53 2014 +0000

description:
Resolve conflicts

diffstat:

 external/gpl3/gcc/dist/INSTALL/binaries.html      |    115 +
 external/gpl3/gcc/dist/INSTALL/build.html         |    378 +
 external/gpl3/gcc/dist/INSTALL/configure.html     |   1293 +
 external/gpl3/gcc/dist/INSTALL/download.html      |     87 +
 external/gpl3/gcc/dist/INSTALL/finalinstall.html  |    172 +
 external/gpl3/gcc/dist/INSTALL/gfdl.html          |    515 +
 external/gpl3/gcc/dist/INSTALL/index.html         |    123 +
 external/gpl3/gcc/dist/INSTALL/old.html           |    201 +
 external/gpl3/gcc/dist/INSTALL/prerequisites.html |    296 +
 external/gpl3/gcc/dist/INSTALL/specific.html      |   1473 +
 external/gpl3/gcc/dist/INSTALL/test.html          |    234 +
 external/gpl3/gcc/dist/LAST_UPDATED               |      1 +
 external/gpl3/gcc/dist/MD5SUMS                    |  80050 ++++++++++++++++++++
 external/gpl3/gcc/dist/NEWS                       |  14005 +++
 external/gpl3/gcc/dist/config.guess               |    149 +-
 external/gpl3/gcc/dist/config.sub                 |     38 +-
 external/gpl3/gcc/dist/gcc/ChangeLog              |   3924 +-
 external/gpl3/gcc/dist/gcc/Makefile.in            |      4 +-
 external/gpl3/gcc/dist/gcc/builtins.c             |     28 +-
 external/gpl3/gcc/dist/gcc/config.gcc             |     38 +-
 external/gpl3/gcc/dist/gcc/config/arm/arm.h       |     11 +-
 external/gpl3/gcc/dist/gcc/config/i386/i386.c     |     29 +-
 external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c |   6316 +-
 external/gpl3/gcc/dist/gcc/config/rs6000/sysv4.h  |     32 +-
 external/gpl3/gcc/dist/gcc/config/rs6000/t-rs6000 |      3 +
 external/gpl3/gcc/dist/gcc/config/sh/sh.c         |      7 +-
 external/gpl3/gcc/dist/gcc/config/sparc/sparc.md  |    375 +-
 external/gpl3/gcc/dist/gcc/config/sparc/sync.md   |     19 +-
 external/gpl3/gcc/dist/gcc/configure              |     25 +-
 external/gpl3/gcc/dist/gcc/configure.ac           |      9 +-
 external/gpl3/gcc/dist/gcc/doc/aot-compile.1      |    208 +
 external/gpl3/gcc/dist/gcc/doc/cpp.1              |   1045 +
 external/gpl3/gcc/dist/gcc/doc/cpp.info           |    Bin 
 external/gpl3/gcc/dist/gcc/doc/cppinternals.info  |    Bin 
 external/gpl3/gcc/dist/gcc/doc/fsf-funding.7      |    192 +
 external/gpl3/gcc/dist/gcc/doc/g++.1              |  20019 +++++
 external/gpl3/gcc/dist/gcc/doc/gc-analyze.1       |    230 +
 external/gpl3/gcc/dist/gcc/doc/gcc.1              |  20019 +++++
 external/gpl3/gcc/dist/gcc/doc/gcc.info           |    Bin 
 external/gpl3/gcc/dist/gcc/doc/gccinstall.info    |    Bin 
 external/gpl3/gcc/dist/gcc/doc/gccint.info        |    Bin 
 external/gpl3/gcc/dist/gcc/doc/gcj-dbtool.1       |    246 +
 external/gpl3/gcc/dist/gcc/doc/gcj.1              |    592 +
 external/gpl3/gcc/dist/gcc/doc/gcj.info           |    Bin 
 external/gpl3/gcc/dist/gcc/doc/gcov.1             |    680 +
 external/gpl3/gcc/dist/gcc/doc/gfdl.7             |    645 +
 external/gpl3/gcc/dist/gcc/doc/gfortran.1         |   1408 +
 external/gpl3/gcc/dist/gcc/doc/gij.1              |    294 +
 external/gpl3/gcc/dist/gcc/doc/gpl.7              |    849 +
 external/gpl3/gcc/dist/gcc/doc/grmic.1            |    221 +
 external/gpl3/gcc/dist/gcc/doc/invoke.texi        |    140 +-
 external/gpl3/gcc/dist/gcc/doc/jcf-dump.1         |    216 +
 external/gpl3/gcc/dist/gcc/doc/jv-convert.1       |    209 +
 external/gpl3/gcc/dist/gcc/doc/rebuild-gcj-db.1   |    180 +
 external/gpl3/gcc/dist/gcc/dse.c                  |      3 +-
 external/gpl3/gcc/dist/gcc/expr.c                 |     13 +-
 external/gpl3/gcc/dist/gcc/gcc.c                  |      2 +-
 external/gpl3/gcc/dist/gcc/gengtype-lex.c         |   2896 +
 external/gpl3/gcc/dist/libbacktrace/configure     |     16 +-
 external/gpl3/gcc/dist/libcpp/files.c             |     26 +-
 external/gpl3/gcc/dist/libcpp/lex.c               |      9 +
 external/gpl3/gcc/dist/libcpp/macro.c             |     25 +-
 external/gpl3/gcc/dist/libgcc/config.host         |      2 +-
 external/gpl3/gcc/dist/libgomp/configure          |     16 +-
 external/gpl3/gcc/dist/libgomp/libgomp.info       |    Bin 
 external/gpl3/gcc/dist/libitm/configure           |     54 +-
 external/gpl3/gcc/dist/libmudflap/configure       |     16 +-
 external/gpl3/gcc/dist/libobjc/configure          |     18 +-
 external/gpl3/gcc/dist/libsanitizer/configure     |     16 +-
 external/gpl3/gcc/dist/libssp/configure           |     16 +-
 external/gpl3/gcc/dist/libstdc++-v3/configure     |     32 +-
 external/gpl3/gcc/dist/lto-plugin/configure       |     16 +-
 72 files changed, 159118 insertions(+), 1401 deletions(-)

diffs (truncated from 164556 to 300 lines):

diff -r 18a685e5b50e -r 823e9d2bc7fb external/gpl3/gcc/dist/INSTALL/binaries.html
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/dist/INSTALL/binaries.html      Tue May 27 09:18:53 2014 +0000
@@ -0,0 +1,115 @@
+<html lang="en">
+<head>
+<title>Installing GCC: Binaries</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="Installing GCC: Binaries">
+<meta name="generator" content="makeinfo 4.12">
+<link title="Top" rel="top" href="#Top">
+<link href="http://www.gnu.org/software/texinfo/"; rel="generator-home" title="Texinfo Homepage">
+<!--
+Copyright (C) 1988-2013 Free Software Foundation, Inc.
+
+   Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, the Front-Cover texts being (a) (see below), and
+with the Back-Cover Texts being (b) (see below).  A copy of the
+license is included in the section entitled "GNU Free Documentation License".
+
+(a) The FSF's Front-Cover Text is:
+
+     A GNU Manual
+
+(b) The FSF's Back-Cover Text is:
+
+     You have freedom to copy and modify this GNU Manual, like GNU
+     software.  Copies published by the Free Software Foundation raise
+     funds for GNU development.-->
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<h1 class="settitle">Installing GCC: Binaries</h1>
+<a name="index-Binaries-1"></a><a name="index-Installing-GCC_003a-Binaries-2"></a>
+We are often asked about pre-compiled versions of GCC.  While we cannot
+provide these for all platforms, below you'll find links to binaries for
+various platforms where creating them by yourself is not easy due to various
+reasons.
+
+   <p>Please note that we did not create these binaries, nor do we
+support them.  If you have any problems installing them, please
+contact their makers.
+
+     <ul>
+<li>AIX:
+          <ul>
+<li><a href="http://www.bullfreeware.com";>Bull's Freeware and Shareware Archive for AIX</a>;
+
+          <li><a href="http://pware.hvcc.edu";>Hudson Valley Community College Open Source Software for IBM System p</a>;
+
+          <li><a href="http://www.perzl.org/aix/";>AIX 5L and 6 Open Source Packages</a>. 
+</ul>
+
+     <li>DOS&mdash;<a href="http://www.delorie.com/djgpp/";>DJGPP</a>.
+
+     <li>Renesas H8/300[HS]&mdash;<a href="http://h8300-hms.sourceforge.net/";>GNU Development Tools for the Renesas H8/300[HS] Series</a>.
+
+     <li>HP-UX:
+          <ul>
+<li><a href="http://hpux.connect.org.uk/";>HP-UX Porting Center</a>;
+
+          <li><a href="ftp://sunsite.informatik.rwth-aachen.de/pub/packages/gcc_hpux/";>Binaries for HP-UX 11.00 at Aachen University of Technology</a>. 
+</ul>
+
+     <li><a href="http://www.sco.com/skunkware/devtools/index.html#gcc";>SCO OpenServer/Unixware</a>.
+
+     <li>Solaris 2 (SPARC, Intel):
+          <ul>
+<li><a href="http://www.sunfreeware.com/";>Sunfreeware</a>
+
+          <li><a href="http://www.blastwave.org/";>Blastwave</a>
+
+          <li><a href="http://www.opencsw.org/";>OpenCSW</a>
+
+          <li><a href="http://jupiterrise.com/tgcware/";>TGCware</a>
+</ul>
+
+     <li>Microsoft Windows:
+          <ul>
+<li>The <a href="http://sourceware.org/cygwin/";>Cygwin</a> project;
+<li>The <a href="http://www.mingw.org/";>MinGW</a> project. 
+</ul>
+
+     <li><a href="ftp://ftp.thewrittenword.com/packages/by-name/";>The Written Word</a> offers binaries for
+AIX 4.3.3, 5.1 and 5.2,
+GNU/Linux (i386),
+HP-UX 10.20, 11.00, and 11.11, and
+Solaris/SPARC 2.5.1, 2.6, 7, 8, 9 and 10.
+
+     <li><a href="http://www.openpkg.org/";>OpenPKG</a> offers binaries for quite a
+number of platforms.
+
+     <li>The <a href="http://gcc.gnu.org/wiki/GFortranBinaries";>GFortran Wiki</a> has
+links to GNU Fortran binaries for several platforms. 
+</ul>
+
+   <p><hr />
+<p><a href="./index.html">Return to the GCC Installation page</a>
+
+<!-- ***Specific**************************************************************** -->
+<!-- ***Old documentation****************************************************** -->
+<!-- ***GFDL******************************************************************** -->
+<!-- *************************************************************************** -->
+<!-- Part 6 The End of the Document -->
+</body></html>
+
diff -r 18a685e5b50e -r 823e9d2bc7fb external/gpl3/gcc/dist/INSTALL/build.html
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/dist/INSTALL/build.html Tue May 27 09:18:53 2014 +0000
@@ -0,0 +1,378 @@
+<html lang="en">
+<head>
+<title>Installing GCC: Building</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="Installing GCC: Building">
+<meta name="generator" content="makeinfo 4.12">
+<link title="Top" rel="top" href="#Top">
+<link href="http://www.gnu.org/software/texinfo/"; rel="generator-home" title="Texinfo Homepage">
+<!--
+Copyright (C) 1988-2013 Free Software Foundation, Inc.
+
+   Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, the Front-Cover texts being (a) (see below), and
+with the Back-Cover Texts being (b) (see below).  A copy of the
+license is included in the section entitled "GNU Free Documentation License".
+
+(a) The FSF's Front-Cover Text is:
+
+     A GNU Manual
+
+(b) The FSF's Back-Cover Text is:
+
+     You have freedom to copy and modify this GNU Manual, like GNU
+     software.  Copies published by the Free Software Foundation raise
+     funds for GNU development.-->
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+--></style>
+</head>
+<body>
+<h1 class="settitle">Installing GCC: Building</h1>
+<a name="index-Installing-GCC_003a-Building-1"></a>
+Now that GCC is configured, you are ready to build the compiler and
+runtime libraries.
+
+   <p>Some commands executed when making the compiler may fail (return a
+nonzero status) and be ignored by <samp><span class="command">make</span></samp>.  These failures, which
+are often due to files that were not found, are expected, and can safely
+be ignored.
+
+   <p>It is normal to have compiler warnings when compiling certain files. 
+Unless you are a GCC developer, you can generally ignore these warnings
+unless they cause compilation to fail.  Developers should attempt to fix
+any warnings encountered, however they can temporarily continue past
+warnings-as-errors by specifying the configure flag
+<samp><span class="option">--disable-werror</span></samp>.
+
+   <p>On certain old systems, defining certain environment variables such as
+<samp><span class="env">CC</span></samp> can interfere with the functioning of <samp><span class="command">make</span></samp>.
+
+   <p>If you encounter seemingly strange errors when trying to build the
+compiler in a directory other than the source directory, it could be
+because you have previously configured the compiler in the source
+directory.  Make sure you have done all the necessary preparations.
+
+   <p>If you build GCC on a BSD system using a directory stored in an old System
+V file system, problems may occur in running <samp><span class="command">fixincludes</span></samp> if the
+System V file system doesn't support symbolic links.  These problems
+result in a failure to fix the declaration of <code>size_t</code> in
+<samp><span class="file">sys/types.h</span></samp>.  If you find that <code>size_t</code> is a signed type and
+that type mismatches occur, this could be the cause.
+
+   <p>The solution is not to use such a directory for building GCC.
+
+   <p>Similarly, when building from SVN or snapshots, or if you modify
+<samp><span class="file">*.l</span></samp> files, you need the Flex lexical analyzer generator
+installed.  If you do not modify <samp><span class="file">*.l</span></samp> files, releases contain
+the Flex-generated files and you do not need Flex installed to build
+them.  There is still one Flex-based lexical analyzer (part of the
+build machinery, not of GCC itself) that is used even if you only
+build the C front end.
+
+   <p>When building from SVN or snapshots, or if you modify Texinfo
+documentation, you need version 4.7 or later of Texinfo installed if you
+want Info documentation to be regenerated.  Releases contain Info
+documentation pre-built for the unmodified documentation in the release.
+
+<h3 class="section"><a name="TOC0"></a>Building a native compiler</h3>
+
+<p>For a native build, the default configuration is to perform
+a 3-stage bootstrap of the compiler when &lsquo;<samp><span class="samp">make</span></samp>&rsquo; is invoked. 
+This will build the entire GCC system and ensure that it compiles
+itself correctly.  It can be disabled with the <samp><span class="option">--disable-bootstrap</span></samp>
+parameter to &lsquo;<samp><span class="samp">configure</span></samp>&rsquo;, but bootstrapping is suggested because
+the compiler will be tested more completely and could also have
+better performance.
+
+   <p>The bootstrapping process will complete the following steps:
+
+     <ul>
+<li>Build tools necessary to build the compiler.
+
+     <li>Perform a 3-stage bootstrap of the compiler.  This includes building
+three times the target tools for use by the compiler such as binutils
+(bfd, binutils, gas, gprof, ld, and opcodes) if they have been
+individually linked or moved into the top level GCC source tree before
+configuring.
+
+     <li>Perform a comparison test of the stage2 and stage3 compilers.
+
+     <li>Build runtime libraries using the stage3 compiler from the previous step.
+
+   </ul>
+
+   <p>If you are short on disk space you might consider &lsquo;<samp><span class="samp">make
+bootstrap-lean</span></samp>&rsquo; instead.  The sequence of compilation is the
+same described above, but object files from the stage1 and
+stage2 of the 3-stage bootstrap of the compiler are deleted as
+soon as they are no longer needed.
+
+   <p>If you wish to use non-default GCC flags when compiling the stage2
+and stage3 compilers, set <code>BOOT_CFLAGS</code> on the command line when
+doing &lsquo;<samp><span class="samp">make</span></samp>&rsquo;.  For example, if you want to save additional space
+during the bootstrap and in the final installation as well, you can
+build the compiler binaries without debugging information as in the
+following example.  This will save roughly 40% of disk space both for
+the bootstrap and the final installation.  (Libraries will still contain
+debugging information.)
+
+<pre class="smallexample">     make BOOT_CFLAGS='-O' bootstrap
+</pre>
+   <p>You can place non-default optimization flags into <code>BOOT_CFLAGS</code>; they
+are less well tested here than the default of &lsquo;<samp><span class="samp">-g -O2</span></samp>&rsquo;, but should
+still work.  In a few cases, you may find that you need to specify special
+flags such as <samp><span class="option">-msoft-float</span></samp> here to complete the bootstrap; or,
+if the native compiler miscompiles the stage1 compiler, you may need
+to work around this, by choosing <code>BOOT_CFLAGS</code> to avoid the parts
+of the stage1 compiler that were miscompiled, or by using &lsquo;<samp><span class="samp">make
+bootstrap4</span></samp>&rsquo; to increase the number of stages of bootstrap.
+
+   <p><code>BOOT_CFLAGS</code> does not apply to bootstrapped target libraries. 
+Since these are always compiled with the compiler currently being
+bootstrapped, you can use <code>CFLAGS_FOR_TARGET</code> to modify their
+compilation flags, as for non-bootstrapped target libraries. 
+Again, if the native compiler miscompiles the stage1 compiler, you may
+need to work around this by avoiding non-working parts of the stage1
+compiler.  Use <code>STAGE1_TFLAGS</code> to this end.
+
+   <p>If you used the flag <samp><span class="option">--enable-languages=...</span></samp> to restrict
+the compilers to be built, only those you've actually enabled will be
+built.  This will of course only build those runtime libraries, for
+which the particular compiler has been built.  Please note,
+that re-defining <samp><span class="env">LANGUAGES</span></samp> when calling &lsquo;<samp><span class="samp">make</span></samp>&rsquo;
+<strong>does not</strong> work anymore!
+
+   <p>If the comparison of stage2 and stage3 fails, this normally indicates
+that the stage2 compiler has compiled GCC incorrectly, and is therefore
+a potentially serious bug which you should investigate and report.  (On
+a few systems, meaningful comparison of object files is impossible; they
+always appear &ldquo;different&rdquo;.  If you encounter this problem, you will
+need to disable comparison in the <samp><span class="file">Makefile</span></samp>.)
+
+   <p>If you do not want to bootstrap your compiler, you can configure with
+<samp><span class="option">--disable-bootstrap</span></samp>.  In particular cases, you may want to
+bootstrap your compiler even if the target system is not the same as
+the one you are building on: for example, you could build a
+<code>powerpc-unknown-linux-gnu</code> toolchain on a
+<code>powerpc64-unknown-linux-gnu</code> host.  In this case, pass
+<samp><span class="option">--enable-bootstrap</span></samp> to the configure script.
+
+   <p><code>BUILD_CONFIG</code> can be used to bring in additional customization
+to the build.  It can be set to a whitespace-separated list of names. 
+For each such <code>NAME</code>, top-level <samp><span class="file">config/</span><code>NAME</code><span class="file">.mk</span></samp> will
+be included by the top-level <samp><span class="file">Makefile</span></samp>, bringing in any settings
+it contains.  The default <code>BUILD_CONFIG</code> can be set using the
+configure option <samp><span class="option">--with-build-config=</span><code>NAME</code><span class="option">...</span></samp>.  Some



Home | Main Index | Thread Index | Old Index