diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index b7517ecd7657562547811e7c9c2402e5a24e7b78..7f8bb29517742b8ae4afe955f4ddf963389814d4 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -190,7 +190,7 @@ build_xm_file=@build_xm_file_list@
 host_xm_file=@host_xm_file_list@
 lang_specs_files=@lang_specs_files@
 lang_options_files=@lang_options_files@
-OBJC_THREAD_FILE=thr-@objc_thread_file@
+GCC_THREAD_FILE=@thread_file@
 version=@version@
 mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`
 
diff --git a/gcc/configure.lang b/gcc/configure.lang
index b7cf12bf4be555a8072629cf9a69486acea92295..20b4c39eaba707e16a299d39eef20491a383eebd 100644
--- a/gcc/configure.lang
+++ b/gcc/configure.lang
@@ -381,7 +381,7 @@ $program_transform_name/" \
 	echo "s|^build_xm_file=.*$|build_xm_file=${build_xm_file_sub}|" >> Makefile.sed
 	echo "s|^lang_specs_files=.*$|lang_specs_files=${lang_specs_files}|" >> Makefile.sed
 	echo "s|^lang_options_files=.*$|lang_options_files=${lang_options_files}|" >> Makefile.sed
-	echo "s|^OBJC_THREAD_FILE=.*$|OBJC_THREAD_FILE=thr-${objc_thread_file}|" >> Makefile.sed
+	echo "s|^GCC_THREAD_FILE=.*$|GCC_THREAD_FILE=${thread_file}|" >> Makefile.sed
 	echo "s|^prefix[ 	]*=.*|prefix = $prefix|" >> Makefile.sed
 	echo "s|^local_prefix[ 	]*=.*|local_prefix = $local_prefix|" >> Makefile.sed
 	echo "s|^exec_prefix[ 	]*=.*|exec_prefix = $exec_prefix|" >> Makefile.sed