diff --git a/toolchain/gcc/patches/3.4.4/200-uclibc-locale.patch b/toolchain/gcc/patches/3.4.4/200-uclibc-locale.patch
index 3fc4900b06..26cf90624e 100644
--- a/toolchain/gcc/patches/3.4.4/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/3.4.4/200-uclibc-locale.patch
@@ -3125,13 +3125,13 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 gcc-3.4.2/libstdc++-v3/cros
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.
-+    AC_DEFINE(HAVE_INT64_T)
++    GLIBCXX_CHECK_INT64_T
 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)
-+        AC_DEFINE(_GLIBCXX_USE_LFS)
++        GLIBCXX_USE_LFS
 +    esac
 +
 +    # For showmanyc_helper().
diff --git a/toolchain/gcc/patches/3.4.5/200-uclibc-locale.patch b/toolchain/gcc/patches/3.4.5/200-uclibc-locale.patch
index a97f22b49a..ed85bff243 100644
--- a/toolchain/gcc/patches/3.4.5/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/3.4.5/200-uclibc-locale.patch
@@ -3134,13 +3134,13 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 gcc-3.4.2/libstdc++-v3/cros
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.
-+    AC_DEFINE(HAVE_INT64_T)
++    GLIBCXX_CHECK_INT64_T
 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)
-+        AC_DEFINE(_GLIBCXX_USE_LFS)
++        GLIBCXX_USE_LFS
 +    esac
 +
 +    # For showmanyc_helper().
diff --git a/toolchain/gcc/patches/3.4.6-nonmips/200-uclibc-locale.patch b/toolchain/gcc/patches/3.4.6-nonmips/200-uclibc-locale.patch
index 3fc4900b06..26cf90624e 100644
--- a/toolchain/gcc/patches/3.4.6-nonmips/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/3.4.6-nonmips/200-uclibc-locale.patch
@@ -3125,13 +3125,13 @@ diff -urN gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 gcc-3.4.2/libstdc++-v3/cros
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.
-+    AC_DEFINE(HAVE_INT64_T)
++    GLIBCXX_CHECK_INT64_T
 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)
-+        AC_DEFINE(_GLIBCXX_USE_LFS)
++        GLIBCXX_USE_LFS
 +    esac
 +
 +    # For showmanyc_helper().
diff --git a/toolchain/gcc/patches/4.0.2/200-uclibc-locale.patch b/toolchain/gcc/patches/4.0.2/200-uclibc-locale.patch
index c57f17312b..0228568977 100644
--- a/toolchain/gcc/patches/4.0.2/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.0.2/200-uclibc-locale.patch
@@ -3070,13 +3070,13 @@ diff -urN gcc-4.1.0/libstdc++-v3/crossconfig.m4 gcc-4.1.0-patched/libstdc++-v3/c
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.
-+    AC_DEFINE(HAVE_INT64_T)
++    GLIBCXX_CHECK_INT64_T
 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)
-+        AC_DEFINE(_GLIBCXX_USE_LFS)
++        GLIBCXX_USE_LFS
 +    esac
 +
 +    # For showmanyc_helper().
diff --git a/toolchain/gcc/patches/4.0.3/200-uclibc-locale.patch b/toolchain/gcc/patches/4.0.3/200-uclibc-locale.patch
index ac4cf97209..e28fbd5326 100644
--- a/toolchain/gcc/patches/4.0.3/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.0.3/200-uclibc-locale.patch
@@ -3117,13 +3117,13 @@ diff -urN gcc-4.0.0-100/libstdc++-v3/crossconfig.m4 gcc-4.0.0/libstdc++-v3/cross
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.
-+    AC_DEFINE(HAVE_INT64_T)
++    GLIBCXX_CHECK_INT64_T
 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)
-+        AC_DEFINE(_GLIBCXX_USE_LFS)
++        GLIBCXX_USE_LFS
 +    esac
 +
 +    # For showmanyc_helper().
diff --git a/toolchain/gcc/patches/4.1.0/200-uclibc-locale.patch b/toolchain/gcc/patches/4.1.0/200-uclibc-locale.patch
index bba729ce79..637a42d905 100644
--- a/toolchain/gcc/patches/4.1.0/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.1.0/200-uclibc-locale.patch
@@ -3125,13 +3125,13 @@ diff -urN gcc-4.1.0/libstdc++-v3/crossconfig.m4 gcc-4.1.0-patched/libstdc++-v3/c
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.
-+    AC_DEFINE(HAVE_INT64_T)
++    GLIBCXX_CHECK_INT64_T
 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)
-+        AC_DEFINE(_GLIBCXX_USE_LFS)
++        GLIBCXX_USE_LFS
 +    esac
 +
 +    # For showmanyc_helper().
diff --git a/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch b/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
index 6cfbc62509..681e81e27c 100644
--- a/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
@@ -3120,13 +3120,13 @@
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.
-+    AC_DEFINE(HAVE_INT64_T)
++    GLIBCXX_CHECK_INT64_T
 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)
-+        AC_DEFINE(_GLIBCXX_USE_LFS)
++        GLIBCXX_USE_LFS
 +    esac
 +
 +    # For showmanyc_helper().