diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index be9364c4ec92..3580f39a453e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-27  Sandra Loosemore  <sandra@codesourcery.com>
+
+	PR libstdc++/65909
+	* testsuite/lib/libstdc++.exp (check_v3_target_namedlocale):
+	Make the generated test program fail gracefully if the target
+	doesn't	support passing command-line arguments.
+
 2015-04-27  Federico Lenarduzzi  <federico.lenarduzzi@tallertechnologies.com>
 	    Jonathan Wakely  <jwakely@redhat.com>
 
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 6a6374a8e6ba..d581a53e3c40 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -901,6 +901,11 @@ proc check_v3_target_namedlocale { args } {
       puts $f "using namespace std;"	
       puts $f "int main (int argc, char** argv)"
       puts $f "{"
+      puts $f "  if (argc < 2)"
+      puts $f "  {"
+      puts $f "    printf(\"locale support test not supported\\n\");"
+      puts $f "    return 1;"
+      puts $f "  }"	
       puts $f "  try"	
       puts $f "  {"
       puts $f "    locale(*(argv + 1));"