Kill off LLVMGCCARCH and LLVMGCC_VERSION make variables.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96909 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.config.in b/Makefile.config.in
index 0fa41f7989be93980df778844f0e787d6fd6f22e..194eb37f614bbb2c5c0a9a11ec87c7ac3349861e 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -183,9 +183,6 @@ TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
 # want to override the value set by configure.
 LLVMGCCDIR := @LLVMGCCDIR@
 
-# Determine the target for which LLVM should generate code.
-LLVMGCCARCH := @target@/@LLVMGCC_VERSION@
-
 # Determine the path where the library executables are
 LLVMGCCLIBEXEC := @LLVMGCCLIBEXEC@
 
@@ -194,7 +191,6 @@ LLVMGCC  := @LLVMGCC@
 LLVMGXX  := @LLVMGXX@
 LLVMCC1  := @LLVMCC1@
 LLVMCC1PLUS := @LLVMCC1PLUS@
-LLVMGCC_VERSION := @LLVMGCC_VERSION@
 LLVMGCC_LANGS := @LLVMGCC_LANGS@
 
 # Path to directory where object files should be stored during a build.

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index debb8b79c5b1850282ba7dcce814a376a24393e6..95b113ef0ddac097d053cfce58d59d98c20db675 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1252,9 +1252,6 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then
   AC_SUBST(LLVMGCCDIR,$llvmgccdir)
   llvmgcclibexec=`echo "$llvmcc1path" | sed 's,/cc1,,'`
   AC_SUBST(LLVMGCCLIBEXEC,$llvmgcclibexec)
-  llvmgccversion=[`"$LLVMGCC" -dumpversion 2>&1 | sed 's/^\([0-9.]*\).*/\1/'`]
-  llvmgccmajvers=[`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`]
-  AC_SUBST(LLVMGCC_VERSION,$llvmgccversion)
   llvmgcclangs=[`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`]
   AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs)
   AC_MSG_RESULT([ok])

diff --git a/configure b/configure
index 41dc4759643d58d2ed945f4723d813fa53886e75..4e69d0b78446adf9c5565870d357312d3b8d8692 100755 (executable)
--- a/configure
+++ b/configure
@@ -765,7 +765,6 @@ LLVMCC1
 LLVMCC1PLUS
 LLVMGCCDIR
 LLVMGCCLIBEXEC
-LLVMGCC_VERSION
 LLVMGCC_LANGS
 SHLIBEXT
 LLVM_PREFIX
@@ -11034,7 +11033,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11037 "configure"
+#line 11036 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19578,10 +19577,6 @@ echo $ECHO_N "checking llvm-gcc component support... $ECHO_C" >&6; }
   llvmgcclibexec=`echo "$llvmcc1path" | sed 's,/cc1,,'`
   LLVMGCCLIBEXEC=$llvmgcclibexec
 
-  llvmgccversion=`"$LLVMGCC" -dumpversion 2>&1 | sed 's/^\([0-9.]*\).*/\1/'`
-  llvmgccmajvers=`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`
-  LLVMGCC_VERSION=$llvmgccversion
-
   llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`
   LLVMGCC_LANGS=$llvmgcclangs
 
@@ -20766,7 +20761,6 @@ LLVMCC1!$LLVMCC1$ac_delim
 LLVMCC1PLUS!$LLVMCC1PLUS$ac_delim
 LLVMGCCDIR!$LLVMGCCDIR$ac_delim
 LLVMGCCLIBEXEC!$LLVMGCCLIBEXEC$ac_delim
-LLVMGCC_VERSION!$LLVMGCC_VERSION$ac_delim
 LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim
 SHLIBEXT!$SHLIBEXT$ac_delim
 LLVM_PREFIX!$LLVM_PREFIX$ac_delim
@@ -20789,7 +20783,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
index aa68f7b97209aca51b429a4c72e75a91b6510bda..7a43dbafeb199c3ecc9f5972ac277e69ff0a0c51 100644 (file)
--- a/tools/llvm-config/CMakeLists.txt
+++ b/tools/llvm-config/CMakeLists.txt
@@ -18,7 +18,6 @@ execute_process(COMMAND date
 #set(LLVMGCCDIR "")
 #set(LLVMGCC "")
 #set(LLVMGXX "")
-#set(LLVMGCC_VERSION "")
 test_big_endian(IS_BIG_ENDIAN)
 if( IS_BIG_ENDIAN )
   set(ENDIAN "big")