shebs 02/08/12 22:59:10
Modified: gcc/testsuite/lib g++.exp gcc.exp objc++.exp objc.exp
Log:
Turn off long double warnings and cpp-precomp, fix up tool finding
for ObjC++.
Revision Changes Path
1.5 +3 -0 gcc3/gcc/testsuite/lib/g++.exp
Index: g++.exp
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/testsuite/lib/g++.exp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- g++.exp 2002/08/02 10:09:27 1.4
+++ g++.exp 2002/08/13 05:59:09 1.5
@@ -297,6 +297,9 @@
set options [concat "$ALWAYS_CXXFLAGS" $options];
+ # APPLE LOCAL long double warning
+ lappend options "additional_flags=-Wno-long-double"
+
if { [regexp "(^| )-frepo( |$)" $options] && \
[regexp "\.o(|bj)$" $dest] } then {
regsub "\.o(|bj)$" $dest ".rpo" rponame
1.13 +3 -2 gcc3/gcc/testsuite/lib/gcc.exp
Index: gcc.exp
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/testsuite/lib/gcc.exp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcc.exp 2002/08/02 10:09:27 1.12
+++ gcc.exp 2002/08/13 05:59:09 1.13
@@ -145,8 +145,9 @@
}
if { 1 } {
lappend options "additional_flags=-DNO_LABEL_VALUES"
- # APPLE LOCAL
- lappend options "additional_flags=-no-cpp-precomp"
+ # APPLE LOCAL cpp-precomp
+ # APPLE LOCAL long double warning
+ lappend options "additional_flags=-no-cpp-precomp -Wno-long-double"
}
if [info exists TOOL_OPTIONS] {
lappend options "additional_flags=$TOOL_OPTIONS"
1.3 +16 -10 gcc3/gcc/testsuite/lib/objc++.exp
Index: objc++.exp
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/testsuite/lib/objc++.exp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- objc++.exp 2002/08/11 19:22:08 1.2
+++ objc++.exp 2002/08/13 05:59:09 1.3
@@ -88,27 +88,34 @@
set objcxx_initialized 0
proc objc++_init { args } {
+ global subdir
+ global objcxx_initialized
+ global base_dir
global tmpdir
global libdir
global gluefile wrap_flags
- global objcxx_initialized
global ALWAYS_CXXFLAGS
+ global GXX_UNDER_TEST
global OBJCXX_UNDER_TEST
global TOOL_EXECUTABLE
+ global TESTING_IN_BUILD_TREE
if { $objcxx_initialized == 1 } { return; }
- if ![info exists OBJCXX_UNDER_TEST] then {
+ if ![info exists GXX_UNDER_TEST] then {
if [info exists TOOL_EXECUTABLE] {
- set OBJCXX_UNDER_TEST $TOOL_EXECUTABLE;
+ set GXX_UNDER_TEST $TOOL_EXECUTABLE;
} else {
- set OBJCXX_UNDER_TEST [find_gcc]
+ if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
+ set GXX_UNDER_TEST [transform c++]
+ } else {
+ set GXX_UNDER_TEST [findfile $base_dir/../g++ "$base_dir/../g++
-B$base_dir/../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]]
+ }
}
}
- set OBJCXX_UNDER_TEST "$OBJCXX_UNDER_TEST -x objective-c++"
- global GXX_UNDER_TEST
- set GXX_UNDER_TEST "$OBJCXX_UNDER_TEST"
+ set OBJCXX_UNDER_TEST "$GXX_UNDER_TEST -x objective-c++"
+
if ![info exists tmpdir] then {
set tmpdir /tmp
}
@@ -144,6 +151,8 @@
lappend ALWAYS_CXXFLAGS "additional_flags=-fmessage-length=0"
verbose -log "ALWAYS_CXXFLAGS set to $ALWAYS_CXXFLAGS"
+
+ verbose "objc++ is initialized" 3
}
proc objc++_target_compile { source dest type options } {
@@ -176,9 +185,6 @@
}
if [info exists TOOL_OPTIONS] {
lappend options "additional_flags=$TOOL_OPTIONS"
- }
- if [target_info exists objc++,no_varargs] {
- lappend options "additional_flags=-DNO_VARARGS"
}
set options [concat "$ALWAYS_CXXFLAGS" $options];
1.6 +2 -0 gcc3/gcc/testsuite/lib/objc.exp
Index: objc.exp
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/testsuite/lib/objc.exp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- objc.exp 2002/08/02 10:09:27 1.5
+++ objc.exp 2002/08/13 05:59:09 1.6
@@ -162,6 +162,8 @@
if [target_info exists objc,no_label_values] {
lappend options "additional_flags=-DNO_LABEL_VALUES"
}
+ # APPLE LOCAL
+ lappend options "additional_flags=-no-cpp-precomp"
if [info exists TOOL_OPTIONS] {
lappend options "additional_flags=$TOOL_OPTIONS"
}
