* configure.ac: Export DEFAULT_TARGET.
    	* configure: Regenerate.
    	* Makefile.in: Regenerate.
    	* testsuite/Makefile.am: Add .EXPORT_ALL_VARIABLES.
    	* testsuite/Makefile.in: Regenerate.
    	* testsuite/debug_msg.sh: Delete duplicate tests.
    	Don't check undef_int error message match for powerpc where the
    	source file and line number aren't available.
This commit is contained in:
Cary Coutant 2013-05-13 17:35:22 +00:00
parent 92ce080be6
commit 9df9de2cca
7 changed files with 33 additions and 36 deletions

View file

@ -1,3 +1,14 @@
2013-05-13 Cary Coutant <ccoutant@google.com>
* configure.ac: Export DEFAULT_TARGET.
* configure: Regenerate.
* Makefile.in: Regenerate.
* testsuite/Makefile.am: Add .EXPORT_ALL_VARIABLES.
* testsuite/Makefile.in: Regenerate.
* testsuite/debug_msg.sh: Delete duplicate tests.
Don't check undef_int error message match for powerpc where the
source file and line number aren't available.
2013-05-10 Roland McGrath <mcgrathr@google.com>
* options.h (General_options): Add --rosegment-gap option.

View file

@ -288,6 +288,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFAULT_TARGET = @DEFAULT_TARGET@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLOPEN_LIBS = @DLOPEN_LIBS@

3
gold/configure vendored
View file

@ -680,6 +680,7 @@ CFLAGS
CC
NM
TARGETOBJS
DEFAULT_TARGET
DEFAULT_TARGET_TILEGX_FALSE
DEFAULT_TARGET_TILEGX_TRUE
DEFAULT_TARGET_X86_64_FALSE
@ -3475,6 +3476,8 @@ else
DEFAULT_TARGET_TILEGX_FALSE=
fi
DEFAULT_TARGET=${targ_obj}
fi
fi
fi

View file

@ -206,6 +206,8 @@ for targ in $target $canon_targets; do
AM_CONDITIONAL(DEFAULT_TARGET_SPARC, test "$targ_obj" = "sparc")
AM_CONDITIONAL(DEFAULT_TARGET_X86_64, test "$targ_obj" = "x86_64")
AM_CONDITIONAL(DEFAULT_TARGET_TILEGX, test "$targ_obj" = "tilegx")
DEFAULT_TARGET=${targ_obj}
AC_SUBST(DEFAULT_TARGET)
fi
fi
fi

View file

@ -53,26 +53,6 @@ TEST_AR = $(top_builddir)/../binutils/ar
TEST_NM = $(top_builddir)/../binutils/nm-new
TEST_AS = $(top_builddir)/../gas/as-new
# Make the default target available to scripts as $DEFAULT_TARGET.
if DEFAULT_TARGET_ARM
export DEFAULT_TARGET = arm
endif
if DEFAULT_TARGET_I386
export DEFAULT_TARGET = i386
endif
if DEFAULT_TARGET_POWERPC
export DEFAULT_TARGET = powerpc
endif
if DEFAULT_TARGET_SPARC
export DEFAULT_TARGET = sparc
endif
if DEFAULT_TARGET_X86_64
export DEFAULT_TARGET = x86_64
endif
if DEFAULT_TARGET_TILEGX
export DEFAULT_TARGET = tilegx
endif
if PLUGINS
LIBDL = -ldl
endif
@ -91,6 +71,9 @@ endif
# the right choice for files 'make' builds that people rebuild.
MOSTLYCLEANFILES = *.so *.syms *.stdout
# Export make variables to the shell scripts so that they can see
# (for example) DEFAULT_TARGET.
.EXPORT_ALL_VARIABLES:
# We will add to these later, for each individual test. Note
# that we add each test under check_SCRIPTS or check_PROGRAMS;

View file

@ -1907,6 +1907,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFAULT_TARGET = @DEFAULT_TARGET@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLOPEN_LIBS = @DLOPEN_LIBS@
@ -4301,13 +4302,9 @@ uninstall-am:
recheck recheck-html tags uninstall uninstall-am
# Make the default target available to scripts as $DEFAULT_TARGET.
@DEFAULT_TARGET_ARM_TRUE@export DEFAULT_TARGET = arm
@DEFAULT_TARGET_I386_TRUE@export DEFAULT_TARGET = i386
@DEFAULT_TARGET_POWERPC_TRUE@export DEFAULT_TARGET = powerpc
@DEFAULT_TARGET_SPARC_TRUE@export DEFAULT_TARGET = sparc
@DEFAULT_TARGET_X86_64_TRUE@export DEFAULT_TARGET = x86_64
@DEFAULT_TARGET_TILEGX_TRUE@export DEFAULT_TARGET = tilegx
# Export make variables to the shell scripts so that they can see
# (for example) DEFAULT_TARGET.
.EXPORT_ALL_VARIABLES:
# The unittests themselves

View file

@ -66,10 +66,10 @@ check debug_msg.err ".*/debug_msg.cc:50: error: undefined reference to 'undef_fn
check debug_msg.err ".*/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'"
check debug_msg.err ".*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
check debug_msg.err ".*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
if test "$DEFAULT_TARGET" != "powerpc"
then
check debug_msg.err ".*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
check debug_msg.err ".*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
check debug_msg.err ".*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
check debug_msg.err ".*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
fi
# Check we detected the ODR (One Definition Rule) violation.
check debug_msg.err ": symbol 'Ordering::operator()(int, int)' defined in multiple places (possible ODR violation):"
@ -100,10 +100,10 @@ then
check debug_msg_cdebug.err ".*/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'"
check debug_msg_cdebug.err ".*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
check debug_msg_cdebug.err ".*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
if test "$DEFAULT_TARGET" != "powerpc"
then
check debug_msg_cdebug.err ".*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
check debug_msg_cdebug.err ".*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
check debug_msg_cdebug.err ".*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
check debug_msg_cdebug.err ".*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
fi
check debug_msg_cdebug.err ": symbol 'Ordering::operator()(int, int)' defined in multiple places (possible ODR violation):"
check debug_msg_cdebug.err "odr_violation1.cc:6"
check debug_msg_cdebug.err "odr_violation2.cc:12"