Skip to content

R
riscv-gcc-1
Commit c875f596 by Diego Novillo Committed by Diego Novillo
Options

Makefile.in (SYSROOT_CFLAGS_FOR_TARGET): Define from @SYSROOT_CFLAGS_FOR_TARGET@. 

	* Makefile.in (SYSROOT_CFLAGS_FOR_TARGET): Define from
	@SYSROOT_CFLAGS_FOR_TARGET@.
	* configure.ac (SYSROOT_CFLAGS_FOR_TARGET): Set from
	build-sysroot.
	* configure: Regenerate.
	(site.exp): Add definition of TEST_ALWAYS_FLAGS.
	Remove setting of GCC_UNDER_TEST.

testsuite/ChangeLog

	* lib/g++.exp (g++_init): Add $TEST_ALWAYS_FLAGS to
	ALWAYS_CXXFLAGS, if defined.
	* lib/gfortran.exp (gfortran_init): Add $TEST_ALWAYS_FLAGS to
	ALWAYS_GFORTRANFLAGS, if defined.
	* lib/go.exp (go_target_compile): Add $TEST_ALWAYS_FLAGS to
	ALWAYS_GOCFLAGS, if defined.
	* lib/obj-c++.exp (obj-c++_init): Add $TEST_ALWAYS_FLAGS to
	ALWAYS_OBJCXXFLAGS, if defined.
	* lib/gcc.exp (gcc_target_compile): Add $TEST_ALWAYS_FLAGS to
	additional_flags, if defined.
	* lib/gnat.exp (gnat_target_compile): Likewise.
	* lib/objc.exp (objc_target_compile): Likewise.
	* lib/target-supports-dg.exp (dg-add-options): Handle
	TEST_ALWAYS_FLAGS.

From-SVN: r178897
parent 54f80b7e
Showing with 110 additions and 4 deletions
gcc/ChangeLog
2011-09-15 Diego Novillo <dnovillo@google.com>
* Makefile.in (SYSROOT_CFLAGS_FOR_TARGET): Define from
@SYSROOT_CFLAGS_FOR_TARGET@.
* configure.ac (SYSROOT_CFLAGS_FOR_TARGET): Set from
build-sysroot.
* configure: Regenerate.
(site.exp): Add definition of TEST_ALWAYS_FLAGS.
Remove setting of GCC_UNDER_TEST.
2011-09-15 Uros Bizjak <ubizjak@gmail.com> 2011-09-15 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.c (output_fp_compare): Return %v prefixed * config/i386/i386.c (output_fp_compare): Return %v prefixed
gcc/Makefile.in
...@@ -384,6 +384,9 @@ USER_H_INC_NEXT_POST = @user_headers_inc_next_post@ ...@@ -384,6 +384,9 @@ USER_H_INC_NEXT_POST = @user_headers_inc_next_post@
# Don't use this as a dependency--use $(GCC_PASSES). # Don't use this as a dependency--use $(GCC_PASSES).
GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) ./xgcc -B./ -B$(build_tooldir)/bin/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include -L$(objdir)/../ld GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) ./xgcc -B./ -B$(build_tooldir)/bin/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include -L$(objdir)/../ld
# Set if the compiler was configured with --with-build-sysroot.
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
# This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET. # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
# It specifies -B./. # It specifies -B./.
# It also specifies -isystem ./include to find, e.g., stddef.h. # It also specifies -isystem ./include to find, e.g., stddef.h.
...@@ -4923,6 +4926,9 @@ site.exp: ./config.status Makefile ...@@ -4923,6 +4926,9 @@ site.exp: ./config.status Makefile
@echo "set CXXFLAGS \"\"" >> ./site.tmp @echo "set CXXFLAGS \"\"" >> ./site.tmp
@echo "set HOSTCC \"$(CC)\"" >> ./site.tmp @echo "set HOSTCC \"$(CC)\"" >> ./site.tmp
@echo "set HOSTCFLAGS \"$(CFLAGS)\"" >> ./site.tmp @echo "set HOSTCFLAGS \"$(CFLAGS)\"" >> ./site.tmp
# TEST_ALWAYS_FLAGS are flags that should be passed to every compilation.
# They are passed first to allow individual tests to override them.
@echo "set TEST_ALWAYS_FLAGS \"$(SYSROOT_CFLAGS_FOR_TARGET)\"" >> ./site.tmp
# When running the tests we set GCC_EXEC_PREFIX to the install tree so that # When running the tests we set GCC_EXEC_PREFIX to the install tree so that
# files that have already been installed there will be found. The -B option # files that have already been installed there will be found. The -B option
# overrides it, so use of GCC_EXEC_PREFIX will not result in using GCC files # overrides it, so use of GCC_EXEC_PREFIX will not result in using GCC files
......
gcc/configure
...@@ -764,6 +764,7 @@ CONFIGURE_SPECS ...@@ -764,6 +764,7 @@ CONFIGURE_SPECS
CROSS_SYSTEM_HEADER_DIR CROSS_SYSTEM_HEADER_DIR
TARGET_SYSTEM_ROOT_DEFINE TARGET_SYSTEM_ROOT_DEFINE
TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT
SYSROOT_CFLAGS_FOR_TARGET
enable_shared enable_shared
enable_fixed_point enable_fixed_point
enable_decimal_float enable_decimal_float
...@@ -7153,11 +7154,16 @@ fi ...@@ -7153,11 +7154,16 @@ fi
# Check whether --with-build-sysroot was given. # Check whether --with-build-sysroot was given.
if test "${with_build_sysroot+set}" = set; then : if test "${with_build_sysroot+set}" = set; then :
withval=$with_build_sysroot; withval=$with_build_sysroot; if test x"$withval" != x ; then
SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
fi
else
SYSROOT_CFLAGS_FOR_TARGET=
fi fi
# Check whether --with-sysroot was given. # Check whether --with-sysroot was given.
if test "${with_sysroot+set}" = set; then : if test "${with_sysroot+set}" = set; then :
withval=$with_sysroot; withval=$with_sysroot;
...@@ -17915,7 +17921,7 @@ else ...@@ -17915,7 +17921,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 17918 "configure" #line 17924 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -18021,7 +18027,7 @@ else ...@@ -18021,7 +18027,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 18024 "configure" #line 18030 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
......
gcc/configure.ac
...@@ -727,7 +727,12 @@ AC_SUBST(enable_shared) ...@@ -727,7 +727,12 @@ AC_SUBST(enable_shared)
AC_ARG_WITH(build-sysroot, AC_ARG_WITH(build-sysroot,
[AS_HELP_STRING([--with-build-sysroot=sysroot], [AS_HELP_STRING([--with-build-sysroot=sysroot],
[use sysroot as the system root during the build])]) [use sysroot as the system root during the build])],
[if test x"$withval" != x ; then
SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
fi],
[SYSROOT_CFLAGS_FOR_TARGET=])
AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
AC_ARG_WITH(sysroot, AC_ARG_WITH(sysroot,
[AS_HELP_STRING([[--with-sysroot[=DIR]]], [AS_HELP_STRING([[--with-sysroot[=DIR]]],
......
gcc/testsuite/ChangeLog
2011-09-15 Diego Novillo <dnovillo@google.com>
* lib/g++.exp (g++_init): Add $TEST_ALWAYS_FLAGS to
ALWAYS_CXXFLAGS, if defined.
* lib/gfortran.exp (gfortran_init): Add $TEST_ALWAYS_FLAGS to
ALWAYS_GFORTRANFLAGS, if defined.
* lib/go.exp (go_target_compile): Add $TEST_ALWAYS_FLAGS to
ALWAYS_GOCFLAGS, if defined.
* lib/obj-c++.exp (obj-c++_init): Add $TEST_ALWAYS_FLAGS to
ALWAYS_OBJCXXFLAGS, if defined.
* lib/gcc.exp (gcc_target_compile): Add $TEST_ALWAYS_FLAGS to
additional_flags, if defined.
* lib/gnat.exp (gnat_target_compile): Likewise.
* lib/objc.exp (objc_target_compile): Likewise.
* lib/target-supports-dg.exp (dg-add-options): Handle
TEST_ALWAYS_FLAGS.
2011-09-15 Tom de Vries <tom@codesourcery.com> 2011-09-15 Tom de Vries <tom@codesourcery.com>
PR testsuite/50322 PR testsuite/50322
......
gcc/testsuite/lib/g++.exp
...@@ -190,6 +190,7 @@ proc g++_init { args } { ...@@ -190,6 +190,7 @@ proc g++_init { args } {
global TESTING_IN_BUILD_TREE global TESTING_IN_BUILD_TREE
global gcc_warning_prefix global gcc_warning_prefix
global gcc_error_prefix global gcc_error_prefix
global TEST_ALWAYS_FLAGS
# We set LC_ALL and LANG to C so that we get the same error messages as expected. # We set LC_ALL and LANG to C so that we get the same error messages as expected.
setenv LC_ALL C setenv LC_ALL C
...@@ -241,6 +242,13 @@ proc g++_init { args } { ...@@ -241,6 +242,13 @@ proc g++_init { args } {
set ALWAYS_CXXFLAGS "" set ALWAYS_CXXFLAGS ""
# TEST_ALWAYS_FLAGS are flags that should be passed to every
# compilation command. They are passed first to allow individual
# tests to override them.
if [info exists TEST_ALWAYS_FLAGS] {
lappend ALWAYS_CXXFLAGS "additional_flags=$TEST_ALWAYS_FLAGS"
}
if ![is_remote host] { if ![is_remote host] {
if [info exists TOOL_OPTIONS] { if [info exists TOOL_OPTIONS] {
lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]" lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"
......
gcc/testsuite/lib/gcc.exp
...@@ -126,6 +126,7 @@ proc gcc_target_compile { source dest type options } { ...@@ -126,6 +126,7 @@ proc gcc_target_compile { source dest type options } {
global gluefile wrap_flags global gluefile wrap_flags
global GCC_UNDER_TEST global GCC_UNDER_TEST
global TOOL_OPTIONS global TOOL_OPTIONS
global TEST_ALWAYS_FLAGS
if {[target_info needs_status_wrapper] != "" && \ if {[target_info needs_status_wrapper] != "" && \
[target_info needs_status_wrapper] != "0" && \ [target_info needs_status_wrapper] != "0" && \
...@@ -143,11 +144,20 @@ proc gcc_target_compile { source dest type options } { ...@@ -143,11 +144,20 @@ proc gcc_target_compile { source dest type options } {
if [target_info exists gcc,no_label_values] { if [target_info exists gcc,no_label_values] {
lappend options "additional_flags=-DNO_LABEL_VALUES" lappend options "additional_flags=-DNO_LABEL_VALUES"
} }
# TEST_ALWAYS_FLAGS are flags that should be passed to every
# compilation. They are passed first to allow individual
# tests to override them.
if [info exists TEST_ALWAYS_FLAGS] {
set options [concat "{additional_flags=$TEST_ALWAYS_FLAGS}" $options]
}
# TOOL_OPTIONS must come first, so that it doesn't override testcase # TOOL_OPTIONS must come first, so that it doesn't override testcase
# specific options. # specific options.
if [info exists TOOL_OPTIONS] { if [info exists TOOL_OPTIONS] {
set options [concat "{additional_flags=$TOOL_OPTIONS}" $options] set options [concat "{additional_flags=$TOOL_OPTIONS}" $options]
} }
lappend options "timeout=[timeout_value]" lappend options "timeout=[timeout_value]"
lappend options "compiler=$GCC_UNDER_TEST" lappend options "compiler=$GCC_UNDER_TEST"
set options [dg-additional-files-options $options $source] set options [dg-additional-files-options $options $source]
......
gcc/testsuite/lib/gfortran.exp
...@@ -144,6 +144,7 @@ proc gfortran_init { args } { ...@@ -144,6 +144,7 @@ proc gfortran_init { args } {
global TESTING_IN_BUILD_TREE global TESTING_IN_BUILD_TREE
global gcc_warning_prefix global gcc_warning_prefix
global gcc_error_prefix global gcc_error_prefix
global TEST_ALWAYS_FLAGS
# We set LC_ALL and LANG to C so that we get the same error messages as expected. # We set LC_ALL and LANG to C so that we get the same error messages as expected.
setenv LC_ALL C setenv LC_ALL C
...@@ -194,6 +195,13 @@ proc gfortran_init { args } { ...@@ -194,6 +195,13 @@ proc gfortran_init { args } {
set ALWAYS_GFORTRANFLAGS "" set ALWAYS_GFORTRANFLAGS ""
# TEST_ALWAYS_FLAGS are flags that should be passed to every
# compilation. They are passed first to allow individual
# tests to override them.
if [info exists TEST_ALWAYS_FLAGS] {
lappend ALWAYS_GFORTRANFLAGS "additional_flags=$TEST_ALWAYS_FLAGS"
}
if ![is_remote host] { if ![is_remote host] {
if [info exists TOOL_OPTIONS] { if [info exists TOOL_OPTIONS] {
lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs ${TOOL_OPTIONS}] ]" lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"
......
gcc/testsuite/lib/gnat.exp
...@@ -115,6 +115,7 @@ proc gnat_target_compile { source dest type options } { ...@@ -115,6 +115,7 @@ proc gnat_target_compile { source dest type options } {
global GNAT_UNDER_TEST global GNAT_UNDER_TEST
global TOOL_OPTIONS global TOOL_OPTIONS
global gnat_target_current global gnat_target_current
global TEST_ALWAYS_FLAGS
# dg-require-effective-target tests must be compiled as C. # dg-require-effective-target tests must be compiled as C.
if [ string match "*.c" $source ] then { if [ string match "*.c" $source ] then {
...@@ -154,6 +155,13 @@ proc gnat_target_compile { source dest type options } { ...@@ -154,6 +155,13 @@ proc gnat_target_compile { source dest type options } {
lappend options "ldflags=$wrap_flags" lappend options "ldflags=$wrap_flags"
} }
# TEST_ALWAYS_FLAGS are flags that should be passed to every
# compilation. They are passed first to allow individual
# tests to override them.
if [info exists TEST_ALWAYS_FLAGS] {
set options [concat "{additional_flags=$TEST_ALWAYS_FLAGS}" $options]
}
# TOOL_OPTIONS must come first, so that it doesn't override testcase # TOOL_OPTIONS must come first, so that it doesn't override testcase
# specific options. # specific options.
if [info exists TOOL_OPTIONS] { if [info exists TOOL_OPTIONS] {
......
gcc/testsuite/lib/go.exp
...@@ -139,6 +139,7 @@ proc go_init { args } { ...@@ -139,6 +139,7 @@ proc go_init { args } {
global TOOL_EXECUTABLE TOOL_OPTIONS global TOOL_EXECUTABLE TOOL_OPTIONS
global GOC_UNDER_TEST global GOC_UNDER_TEST
global TESTING_IN_BUILD_TREE global TESTING_IN_BUILD_TREE
global TEST_ALWAYS_FLAGS
# We set LC_ALL and LANG to C so that we get the same error messages as expected. # We set LC_ALL and LANG to C so that we get the same error messages as expected.
setenv LC_ALL C setenv LC_ALL C
...@@ -174,6 +175,13 @@ proc go_init { args } { ...@@ -174,6 +175,13 @@ proc go_init { args } {
set ALWAYS_GOCFLAGS "" set ALWAYS_GOCFLAGS ""
# TEST_ALWAYS_FLAGS are flags that should be passed to every
# compilation. They are passed first to allow individual
# tests to override them.
if [info exists TEST_ALWAYS_FLAGS] {
lappend ALWAYS_GOCFLAGS "additional_flags=$TEST_ALWAYS_FLAGS"
}
if ![is_remote host] { if ![is_remote host] {
if [info exists TOOL_OPTIONS] { if [info exists TOOL_OPTIONS] {
lappend ALWAYS_GOCFLAGS "additional_flags=[go_include_flags [get_multilibs ${TOOL_OPTIONS}] ]" lappend ALWAYS_GOCFLAGS "additional_flags=[go_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"
......
gcc/testsuite/lib/obj-c++.exp
...@@ -212,6 +212,7 @@ proc obj-c++_init { args } { ...@@ -212,6 +212,7 @@ proc obj-c++_init { args } {
global TESTING_IN_BUILD_TREE global TESTING_IN_BUILD_TREE
global gcc_warning_prefix global gcc_warning_prefix
global gcc_error_prefix global gcc_error_prefix
global TEST_ALWAYS_FLAGS
if ![info exists OBJCXX_UNDER_TEST] then { if ![info exists OBJCXX_UNDER_TEST] then {
if [info exists TOOL_EXECUTABLE] { if [info exists TOOL_EXECUTABLE] {
...@@ -248,6 +249,13 @@ proc obj-c++_init { args } { ...@@ -248,6 +249,13 @@ proc obj-c++_init { args } {
set ALWAYS_OBJCXXFLAGS "" set ALWAYS_OBJCXXFLAGS ""
# TEST_ALWAYS_FLAGS are flags that should be passed to every
# compilation. They are passed first to allow individual
# tests to override them.
if [info exists TEST_ALWAYS_FLAGS] {
lappend ALWAYS_OBJCXXFLAGS "additional_flags=$TEST_ALWAYS_FLAGS"
}
if ![is_remote host] { if ![is_remote host] {
if [info exists TOOL_OPTIONS] { if [info exists TOOL_OPTIONS] {
lappend ALWAYS_OBJCXXFLAGS "additional_flags=[obj-c++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"; lappend ALWAYS_OBJCXXFLAGS "additional_flags=[obj-c++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]";
......
gcc/testsuite/lib/objc.exp
...@@ -142,6 +142,7 @@ proc objc_target_compile { source dest type options } { ...@@ -142,6 +142,7 @@ proc objc_target_compile { source dest type options } {
global ld_library_path global ld_library_path
global objc_libgcc_s_path global objc_libgcc_s_path
global shlib_ext global shlib_ext
global TEST_ALWAYS_FLAGS
set shlib_ext [get_shlib_extension] set shlib_ext [get_shlib_extension]
set ld_library_path ".:${objc_libgcc_s_path}" set ld_library_path ".:${objc_libgcc_s_path}"
...@@ -199,6 +200,14 @@ proc objc_target_compile { source dest type options } { ...@@ -199,6 +200,14 @@ proc objc_target_compile { source dest type options } {
if [target_info exists objc,no_label_values] { if [target_info exists objc,no_label_values] {
lappend options "additional_flags=-DNO_LABEL_VALUES" lappend options "additional_flags=-DNO_LABEL_VALUES"
} }
# TEST_ALWAYS_FLAGS are flags that should be passed to every
# compilation. They are passed first to allow individual
# tests to override them.
if [info exists TEST_ALWAYS_FLAGS] {
set options [concat "{additional_flags=$TEST_ALWAYS_FLAGS}" $options]
}
# TOOL_OPTIONS must come first, so that it doesn't override testcase # TOOL_OPTIONS must come first, so that it doesn't override testcase
# specific options. # specific options.
if [info exists TOOL_OPTIONS] { if [info exists TOOL_OPTIONS] {
......
gcc/testsuite/lib/target-supports-dg.exp
...@@ -262,6 +262,7 @@ proc dg-add-options { args } { ...@@ -262,6 +262,7 @@ proc dg-add-options { args } {
proc check-flags { args } { proc check-flags { args } {
global compiler_flags global compiler_flags
global TOOL_OPTIONS global TOOL_OPTIONS
global TEST_ALWAYS_FLAGS
# The args are within another list; pull them out. # The args are within another list; pull them out.
set args [lindex $args 0] set args [lindex $args 0]
...@@ -272,6 +273,8 @@ proc check-flags { args } { ...@@ -272,6 +273,8 @@ proc check-flags { args } {
append compiler_flags [current_compiler_flags] append compiler_flags [current_compiler_flags]
# If running a subset of the test suite, $TOOL_OPTIONS may not exist. # If running a subset of the test suite, $TOOL_OPTIONS may not exist.
catch {append compiler_flags " $TOOL_OPTIONS "} catch {append compiler_flags " $TOOL_OPTIONS "}
# If running a subset of the test suite, $TEST_ALWAYS_FLAGS may not exist.
catch {append compiler_flags " $TEST_ALWAYS_FLAGS "}
set dest [target_info name] set dest [target_info name]
if [board_info $dest exists multilib_flags] { if [board_info $dest exists multilib_flags] {
append compiler_flags "[board_info $dest multilib_flags] " append compiler_flags "[board_info $dest multilib_flags] "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment