diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 952c3ca1136e54353a1a00124ded37d776f96828..dedc26458690b2c8b2a7dd6e873b4a45dd61315e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-27  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+	* lib/target-supports.exp (check_effective_target_mmap): Use
+	check_function_available.
+
 2011-07-27  Jeffrey Yasskin  <jyasskin@google.com>
 
 	* g++.old-deja/g++.pt/crash60.C: Updated.
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index f7027bdb6abbe60782c41d8850e307a15cb5afcc..28dedc97d328bbd12dc4b94650468d8f4c494a65 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -700,9 +700,7 @@ proc check_effective_target_fopenmp {} {
 # Return 1 if the target supports mmap, 0 otherwise.
 
 proc check_effective_target_mmap {} {
-    return [check_no_compiler_messages mmap assembly {
-	#include <sys/mman.h>
-    }]
+    return [check_function_available "mmap"]
 }
 
 # Return 1 if compilation with -pthread is error-free for trivial