diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf0d43a81f2b62d63c2dd14cbd02222949bd6e35..148b659313f1a77b2207b5231089edcd5fa09e4c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2004-01-03  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+        * configure.ac: Replace gcc_AC_CHECK_TYPE with AC_CHECK_TYPE.
+        * aclocal.m4 (gcc_AC_CHECK_TYPE): Remove.
+        * configure: Regenerate.
+
 	* doc/install.texi: Note that 'gcc' is now a 2.57 directory.
 
 	* configure.in: Rename to configure.ac.
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index e2ed6b505904cd160a273a54be3d96726f16eb6d..054a2bb3ec7c04e689730a049948441f16ecffc6 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -16,27 +16,6 @@ if test $ac_cv_header_stdbool_h = yes; then
 fi
 ])
 
-dnl Fixed AC_CHECK_TYPE that doesn't need anything in acconfig.h.
-dnl Remove after migrating to 2.5x.
-AC_DEFUN([gcc_AC_CHECK_TYPE],
-[AC_REQUIRE([AC_HEADER_STDC])dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(ac_cv_type_$1,
-[AC_EGREP_CPP(dnl
-changequote(<<,>>)dnl
-<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
-changequote([,]), [#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
-AC_MSG_RESULT($ac_cv_type_$1)
-if test $ac_cv_type_$1 = no; then
-  AC_DEFINE($1, $2, [Define as \`$2' if <sys/types.h> doesn't define.])
-fi
-])
-
-
 dnl See whether we can include both string.h and strings.h.
 AC_DEFUN([gcc_AC_HEADER_STRING],
 [AC_CACHE_CHECK([whether string.h and strings.h may both be included],
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 9b6dbcd0f7e63dbea52439e9fc35d4367cc90d7c..cbeb3e16b864b01401b4e95eaaf410325c783948 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -806,7 +806,7 @@ int main()
   fi
 fi
 
-gcc_AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPE(ssize_t, int)
 
 # Try to determine the array type of the second argument of getgroups
 # for the target system (int or gid_t).