diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 874fc97beeec971c706bce5feb70206d9c2f4036..8a258c484009448eab92b121344383325bdab409 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+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.
+ * config.gcc: Don't set lto_binary_reader.
+ * Makefile.in (LIBELFLIBS, LIBELFINC): Remove variables.
+ (LTO_BINARY_READER, LTO_USE_LIBELF): Remove variables.
+ (LIBS): Remove $(LIBELFLIBS).
+ (INCLUDES): Remove $(LIBELFINC).
+ * configure: Rebuild.
+ * config.in: Rebuild.
+
2010-11-02 Nathan Froyd <froydnj@codesourcery.com>
* config/microblaze/microblaze-protos.h (function_arg): Delete.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 922b13283667d30ee5ce864d1a5dbe3cb51dd928..2e7b3d19dfc238ceccab4bbfb5bab474bfc18ef8 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -319,17 +319,9 @@ PPLINC = @PPLINC@
CLOOGLIBS = @CLOOGLIBS@
CLOOGINC = @CLOOGINC@
-# How to find libelf
-LIBELFLIBS = @LIBELFLIBS@
-LIBELFINC = @LIBELFINC@
-
# Set to 'yes' if the LTO front end is enabled.
enable_lto = @enable_lto@
-# Set according to LTO object file format.
-LTO_BINARY_READER = @LTO_BINARY_READER@
-LTO_USE_LIBELF = @LTO_USE_LIBELF@
-
# Compiler and flags needed for plugin support
ifneq ($(ENABLE_BUILD_WITH_CXX),yes)
PLUGINCC = @CC@
@@ -1034,7 +1026,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER) \
$(HOST_LIBS)
BACKENDLIBS = $(CLOOGLIBS) $(PPLLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
- $(ZLIB) $(LIBELFLIBS)
+ $(ZLIB)
# Any system libraries needed just for GNAT.
SYSLIBS = @GNAT_LIBEXC@
@@ -1065,7 +1057,7 @@ BUILD_ERRORS = build/errors.o
INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
-I$(srcdir)/../include @INCINTL@ \
$(CPPINC) $(GMPINC) $(DECNUMINC) \
- $(PPLINC) $(CLOOGINC) $(LIBELFINC)
+ $(PPLINC) $(CLOOGINC)
.c.o:
$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $< $(OUTPUT_OPTION)
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 8dce3d55a85a0fd318e21bcf894e19ff20295536..9b8e0a4291180539ca8378b826256b3ca39b24f4 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -219,8 +219,6 @@ 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=
@@ -1160,13 +1158,11 @@ 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"
@@ -1421,7 +1417,6 @@ 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"
@@ -1494,7 +1489,6 @@ 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"
@@ -2006,7 +2000,6 @@ powerpc-*-darwin*)
;;
esac
tmake_file="${tmake_file} t-slibgcc-darwin"
- lto_binary_reader=lto-macho
extra_headers=altivec.h
;;
powerpc64-*-darwin*)
@@ -2014,7 +2007,6 @@ 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*)
diff --git a/gcc/config.in b/gcc/config.in
index 4576de072d2dda20f9122bb6741614c2114930f0..6e3d03fb088a234f20b38f04239694b97d6de7a4 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -826,24 +826,6 @@
#endif
-/* Define to 1 if you have the `elf_getshdrstrndx' function. */
-#ifndef USED_FOR_TARGET
-#undef HAVE_ELF_GETSHDRSTRNDX
-#endif
-
-
-/* Define to 1 if you have the `elf_getshstrndx' function. */
-#ifndef USED_FOR_TARGET
-#undef HAVE_ELF_GETSHSTRNDX
-#endif
-
-
-/* Define if elf_getshstrndx has gABI conformant return values. */
-#ifndef USED_FOR_TARGET
-#undef HAVE_ELF_GETSHSTRNDX_GABI
-#endif
-
-
/* Define to 1 if you have the <fcntl.h> header file. */
#ifndef USED_FOR_TARGET
#undef HAVE_FCNTL_H
@@ -1522,12 +1504,6 @@
#endif
-/* Define if libelf is in use. */
-#ifndef USED_FOR_TARGET
-#undef HAVE_libelf
-#endif
-
-
/* Define as const if the declaration of iconv() needs const. */
#ifndef USED_FOR_TARGET
#undef ICONV_CONST
diff --git a/gcc/configure b/gcc/configure
index 40a21bbb063f2d03e7c41002c665c3491dbf5f65..da157e09f74606b28941dadffcc223805a224228 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -602,8 +602,6 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
enable_plugin
pluginlibs
-LIBELFINC
-LIBELFLIBS
CLOOGINC
CLOOGLIBS
PPLINC
@@ -672,8 +670,6 @@ subdirs
slibdir
dollar
gcc_tooldir
-LTO_USE_LIBELF
-LTO_BINARY_READER
enable_lto
MAINT
zlibinc
@@ -933,9 +929,7 @@ GMPINC
PPLLIBS
PPLINC
CLOOGLIBS
-CLOOGINC
-LIBELFLIBS
-LIBELFINC'
+CLOOGINC'
# Initialize some variables set by options.
@@ -1681,8 +1675,6 @@ Some influential environment variables:
PPLINC How to find PPL include files
CLOOGLIBS How to link CLOOG
CLOOGINC How to find CLOOG include files
- LIBELFLIBS How to link libelf
- LIBELFINC How to find libelf include files
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -8431,59 +8423,6 @@ fi
done
-save_CPPFLAGS="$CPPFLAGS"
-save_LIBS="$LIBS"
-LIBS="$LIBS $LIBELFLIBS"
-for ac_func in elf_getshdrstrndx
-do :
- ac_fn_c_check_func "$LINENO" "elf_getshdrstrndx" "ac_cv_func_elf_getshdrstrndx"
-if test "x$ac_cv_func_elf_getshdrstrndx" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_ELF_GETSHDRSTRNDX 1
-_ACEOF
-
-else
- for ac_func in elf_getshstrndx
-do :
- ac_fn_c_check_func "$LINENO" "elf_getshstrndx" "ac_cv_func_elf_getshstrndx"
-if test "x$ac_cv_func_elf_getshstrndx" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_ELF_GETSHSTRNDX 1
-_ACEOF
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <libelf.h>
-int main()
-{
- return elf_getshstrndx (NULL, 0) == 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-$as_echo "#define HAVE_ELF_GETSHSTRNDX_GABI 1" >>confdefs.h
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-done
-
-
-fi
-done
-
-LIBS="$save_LIBS"
-CPPFLAGS="$save_CPPFLAGS"
-
if test x$ac_cv_func_mbstowcs = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbstowcs works" >&5
$as_echo_n "checking whether mbstowcs works... " >&6; }
@@ -17143,7 +17082,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 17146 "configure"
+#line 17085 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17249,7 +17188,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 17252 "configure"
+#line 17191 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -25498,17 +25437,6 @@ $as_echo "#define ENABLE_LTO 1" >>confdefs.h
enable_lto=yes
- # LTO needs to speak the platform's object file format, and has a
- # number of implementations of the required binary file access APIs.
- # ELF is the most common, and default. We only link libelf if ELF
- # is indeed the selected format.
- LTO_BINARY_READER=${lto_binary_reader}
- LTO_USE_LIBELF=-lelf
- if test "x$lto_binary_reader" != "xlto-elf" ; then
- LTO_USE_LIBELF=
- fi
-
-
;;
*) ;;
esac
@@ -25688,14 +25616,6 @@ $as_echo "#define HAVE_cloog 1" >>confdefs.h
fi
-
-
-if test "x${LIBELFLIBS}" != "x" ; then
-
-$as_echo "#define HAVE_libelf 1" >>confdefs.h
-
-fi
-
# Check for plugin support
# Check whether --enable-plugin was given.
if test "${enable_plugin+set}" = set; then :
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 4df68fc10b445939e67b98f96bba5dc0593b1b67..966dbd38bc15c6fa0ed95fd7afb5043f94e3bd7c 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -975,22 +975,6 @@ AC_CHECK_FUNCS(times clock kill getrlimit setrlimit atoll atoq \
gettimeofday mbstowcs wcswidth mmap mincore setlocale \
gcc_UNLOCKED_FUNCS)
-save_CPPFLAGS="$CPPFLAGS"
-save_LIBS="$LIBS"
-LIBS="$LIBS $LIBELFLIBS"
-AC_CHECK_FUNCS(elf_getshdrstrndx,,
- [AC_CHECK_FUNCS(elf_getshstrndx,
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
-#include <libelf.h>
-int main()
-{
- return elf_getshstrndx (NULL, 0) == 0;
-}]])], AC_DEFINE(HAVE_ELF_GETSHSTRNDX_GABI, 1,
- [Define if elf_getshstrndx has gABI conformant return values.]))])]
- )
-LIBS="$save_LIBS"
-CPPFLAGS="$save_CPPFLAGS"
-
if test x$ac_cv_func_mbstowcs = xyes; then
AC_CACHE_CHECK(whether mbstowcs works, gcc_cv_func_mbstowcs_works,
[ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
@@ -4461,17 +4445,6 @@ changequote([,])dnl
AC_DEFINE(ENABLE_LTO, 1, [Define to enable LTO support.])
enable_lto=yes
AC_SUBST(enable_lto)
- # LTO needs to speak the platform's object file format, and has a
- # number of implementations of the required binary file access APIs.
- # ELF is the most common, and default. We only link libelf if ELF
- # is indeed the selected format.
- LTO_BINARY_READER=${lto_binary_reader}
- LTO_USE_LIBELF=-lelf
- if test "x$lto_binary_reader" != "xlto-elf" ; then
- LTO_USE_LIBELF=
- fi
- AC_SUBST(LTO_BINARY_READER)
- AC_SUBST(LTO_USE_LIBELF)
;;
*) ;;
esac
@@ -4644,12 +4617,6 @@ if test "x${CLOOGLIBS}" != "x" ; then
AC_DEFINE(HAVE_cloog, 1, [Define if cloog is in use.])
fi
-AC_ARG_VAR(LIBELFLIBS,[How to link libelf])
-AC_ARG_VAR(LIBELFINC,[How to find libelf include files])
-if test "x${LIBELFLIBS}" != "x" ; then
- AC_DEFINE(HAVE_libelf, 1, [Define if libelf is in use.])
-fi
-
# Check for plugin support
AC_ARG_ENABLE(plugin,
[ --enable-plugin enable plugin support],