Index: gcc/libgomp/testsuite/lib/libgomp.exp |
diff --git a/gcc/libgomp/testsuite/lib/libgomp.exp b/gcc/libgomp/testsuite/lib/libgomp.exp |
index 972d4a1fdd3f6124edc9a7d3d8065cc60ab92030..0b0b608bf9e53c0fb6a05bc936f5a0a217bb4633 100644 |
--- a/gcc/libgomp/testsuite/lib/libgomp.exp |
+++ b/gcc/libgomp/testsuite/lib/libgomp.exp |
@@ -66,6 +66,13 @@ proc libgomp_init { args } { |
setenv LC_ALL C |
setenv LANG C |
+ # Many hosts now default to a non-ASCII C locale, however, so |
+ # they can set a charset encoding here if they need. |
+ if { [ishost "*-*-cygwin*"] } { |
+ setenv LC_ALL C.ASCII |
+ setenv LANG C.ASCII |
+ } |
+ |
if ![info exists GCC_UNDER_TEST] then { |
if [info exists TOOL_EXECUTABLE] { |
set GCC_UNDER_TEST $TOOL_EXECUTABLE |
@@ -123,6 +130,9 @@ proc libgomp_init { args } { |
set ALWAYS_CFLAGS "" |
if { $blddir != "" } { |
lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/" |
+ # targets that use libgomp.a%s in their specs need a -B option |
+ # for uninstalled testing. |
+ lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/.libs" |
lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}" |
lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs" |
} |