PR lto/46273

	* config.gcc: Revert last patch: set lto_binary_reader.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166207 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7966532..9c50ffe 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-02  Ian Lance Taylor  <iant@google.com>
+
+       PR lto/46273
+       * config.gcc: Revert last patch: set lto_binary_reader.
+
 2010-11-02  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/46149
@@ -88,6 +93,17 @@
 
 2010-11-02  Ian Lance Taylor  <iant@google.com>
 
+       * doc/install.texi (Configuration): Note in two places that Java
+       is not enabled by default.
+
+2010-11-02  Ian Lance Taylor  <iant@google.com>
+
+       * doc/install.texi (Prerequisites): Remove libelf paragraphs.
+       (Configuration): Mention --disable-lto.  Remove --with-libelf
+       paragraph.
+
+2010-11-02  Ian Lance Taylor  <iant@google.com>
+
        * configure.ac: Remove elf_getshdrstrndx test.  Don't substitute
        LTO_BINARY_READER or LTO_USE_LIBELF.  Remove LIBELFLIBS and
        LIBELFINC.  Remove HAVE_libelf.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 9b8e0a4..8dce3d5 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -219,6 +219,8 @@ default_gnu_indirect_function=no
 target_gtfiles=
 need_64bit_hwint=
 need_64bit_isa=
+# Selects the object file format reader/writer used by LTO.
+lto_binary_reader=lto-elf
 
 # Don't carry these over build->host->target.  Please.
 xm_file=
@@ -1158,11 +1160,13 @@ i[34567]86-*-darwin*)
        # support.
        with_cpu=${with_cpu:-generic}
        tmake_file="${tmake_file} t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
+       lto_binary_reader=lto-macho
        ;;
 x86_64-*-darwin*)
        with_cpu=${with_cpu:-generic}
        tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        tm_file="${tm_file} ${cpu_type}/darwin64.h"
+       lto_binary_reader=lto-macho
        ;;
 i[34567]86-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h"
@@ -1417,6 +1421,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
                thread_file='posix'
        fi
        use_gcc_stdint=wrap
+       lto_binary_reader=lto-coff
        ;;
 i[34567]86-*-mingw* | x86_64-*-mingw*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
@@ -1489,6 +1494,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        default_use_cxa_atexit=yes
        use_gcc_stdint=wrap
+       lto_binary_reader=lto-coff
        case ${enable_threads} in
          "" | yes | win32)       thread_file='win32'
          tmake_file="${tmake_file} i386/t-gthr-win32"
@@ -2000,6 +2006,7 @@ powerpc-*-darwin*)
            ;;
        esac
        tmake_file="${tmake_file} t-slibgcc-darwin"
+       lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc64-*-darwin*)
@@ -2007,6 +2014,7 @@ powerpc64-*-darwin*)
        extra_parts="crt2.o"
        tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin"
        tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
+       lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc*-*-freebsd*)