diff --git a/Makefile b/Makefile
index 319bdcd0fba..20395e9470d 100644
--- a/Makefile
+++ b/Makefile
@@ -43,13 +43,6 @@ EXTRA_DIST := test unittests llvm.spec include win32 Xcode
 
 include $(LEVEL)/Makefile.config
 
-# llvm-gcc4 doesn't need runtime libs.  llvm-gcc4 is the only supported one.
-# FIXME: Remove runtime entirely once we have an understanding of where
-# libprofile etc should go.
-#ifeq ($(LLVMGCC_MAJVERS),4)
-#  DIRS := $(filter-out runtime, $(DIRS))
-#endif
-
 ifeq ($(MAKECMDGOALS),libs-only)
   DIRS := $(filter-out tools runtime docs, $(DIRS))
   OPTIONAL_DIRS :=
diff --git a/Makefile.config.in b/Makefile.config.in
index 2cc69dcf4cf..0fa41f7989b 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -184,11 +184,7 @@ TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
 LLVMGCCDIR := @LLVMGCCDIR@
 
 # Determine the target for which LLVM should generate code.
-ifeq (@LLVMGCC_MAJVERS@,3)
-LLVMGCCARCH := @target@/3.4-llvm
-else
 LLVMGCCARCH := @target@/@LLVMGCC_VERSION@
-endif
 
 # Determine the path where the library executables are
 LLVMGCCLIBEXEC := @LLVMGCCLIBEXEC@
@@ -199,7 +195,6 @@ LLVMGXX  := @LLVMGXX@
 LLVMCC1  := @LLVMCC1@
 LLVMCC1PLUS := @LLVMCC1PLUS@
 LLVMGCC_VERSION := @LLVMGCC_VERSION@
-LLVMGCC_MAJVERS := @LLVMGCC_MAJVERS@
 LLVMGCC_LANGS := @LLVMGCC_LANGS@
 
 # Path to directory where object files should be stored during a build.
diff --git a/Makefile.rules b/Makefile.rules
index 761cc812bee..35d04271c56 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -532,13 +532,8 @@ endif
 ifndef LUPGRADE
 LUPGRADE := $(LLVMToolDir)/llvm-upgrade$(EXEEXT)
 endif
-ifeq ($(LLVMGCC_MAJVERS),3)
-LLVMGCCWITHPATH  := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGCC)
-LLVMGXXWITHPATH  := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGXX)
-else
 LLVMGCCWITHPATH  := $(LLVMGCC)
 LLVMGXXWITHPATH  := $(LLVMGXX)
-endif
 
 #--------------------------------------------------------------------
 # Adjust to user's request
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 40f77d828e2..debb8b79c5b 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1255,7 +1255,6 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then
   llvmgccversion=[`"$LLVMGCC" -dumpversion 2>&1 | sed 's/^\([0-9.]*\).*/\1/'`]
   llvmgccmajvers=[`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`]
   AC_SUBST(LLVMGCC_VERSION,$llvmgccversion)
-  AC_SUBST(LLVMGCC_MAJVERS,$llvmgccmajvers)
   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 88050f310ca..41dc4759643 100755
--- a/configure
+++ b/configure
@@ -766,7 +766,6 @@ LLVMCC1PLUS
 LLVMGCCDIR
 LLVMGCCLIBEXEC
 LLVMGCC_VERSION
-LLVMGCC_MAJVERS
 LLVMGCC_LANGS
 SHLIBEXT
 LLVM_PREFIX
@@ -11035,7 +11034,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11038 "configure"
+#line 11037 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19583,8 +19582,6 @@ echo $ECHO_N "checking llvm-gcc component support... $ECHO_C" >&6; }
   llvmgccmajvers=`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`
   LLVMGCC_VERSION=$llvmgccversion
 
-  LLVMGCC_MAJVERS=$llvmgccmajvers
-
   llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`
   LLVMGCC_LANGS=$llvmgcclangs
 
@@ -20770,7 +20767,6 @@ LLVMCC1PLUS!$LLVMCC1PLUS$ac_delim
 LLVMGCCDIR!$LLVMGCCDIR$ac_delim
 LLVMGCCLIBEXEC!$LLVMGCCLIBEXEC$ac_delim
 LLVMGCC_VERSION!$LLVMGCC_VERSION$ac_delim
-LLVMGCC_MAJVERS!$LLVMGCC_MAJVERS$ac_delim
 LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim
 SHLIBEXT!$SHLIBEXT$ac_delim
 LLVM_PREFIX!$LLVM_PREFIX$ac_delim
@@ -20793,7 +20789,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` = 88; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; 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 8a710ea1cc8..aa68f7b9720 100644
--- a/tools/llvm-config/CMakeLists.txt
+++ b/tools/llvm-config/CMakeLists.txt
@@ -19,7 +19,6 @@ execute_process(COMMAND date
 #set(LLVMGCC "")
 #set(LLVMGXX "")
 #set(LLVMGCC_VERSION "")
-#set(LLVMGCC_MAJVERS "")
 test_big_endian(IS_BIG_ENDIAN)
 if( IS_BIG_ENDIAN )
   set(ENDIAN "big")