       noconfigdirs="$noconfigdirs ld gas gprof"
       noconfigdirs="$noconfigdirs sim target-rda"
       ;;
-+   *-android-*)
++   *-android*)
 +   # The Android C++ environment does not support exceptions or rtti,
 +   # and so building libstdc++-v3 tends not to always work.
 +     noconfigdirs="$noconfigdirs target-newlib target-libstdc++-v3 ${libgcj}"

+ # Android's getpagesize is a static __inline__ which confuses
+ # the autoconf test.
+ case ${host} in
+ *-android-*) ac_cv_func_getpagesize=yes ;;
+ esac
+ 
  # This works around the fact that libtool configuration may change LD

+# Android's getpagesize is a static __inline__ which confuses
+# the autoconf test.
+case ${host} in
+*-android*) ac_cv_func_getpagesize=yes ;;
+esac
 
 
