[Pkg-gdb-logs] [dejagnu] 05/08: d/p/000*: cherry picked from upstream master branch

[Hector Oron]

This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch master
in repository dejagnu.

commit 0fb837bba02099ffdad40599ce3dfda82f946138
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Thu Mar 19 18:58:47 2015 +0100

    d/p/000*: cherry picked from upstream master branch
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>
---
 .../0002-doc-runtest.1-Fix-a-spelling-error.patch  | 28 ++++++++++++++
 ...rk.exp-log_and_exit-Set-tool-to-testrun-i.patch | 31 +++++++++++++++
 ...exp-default_target_compile-Prepend-multil.patch | 44 ++++++++++++++++++++++
 3 files changed, 103 insertions(+)

diff --git a/debian/patches/0002-doc-runtest.1-Fix-a-spelling-error.patch b/debian/patches/0002-doc-runtest.1-Fix-a-spelling-error.patch
new file mode 100644
index 0000000..0f9e27c
--- /dev/null
+++ b/debian/patches/0002-doc-runtest.1-Fix-a-spelling-error.patch
@@ -0,0 +1,28 @@
+From 64ab9a36c5d6ff9019baa9d03c76d2136a72dbce Mon Sep 17 00:00:00 2001
+From: Ben Elliston <bje at gnu.org>
+Date: Thu, 5 Feb 2015 00:01:01 +1100
+Subject: [PATCH 2/4] 	* doc/runtest.1: Fix a spelling error.
+
+---
+ ChangeLog     | 4 ++++
+ doc/runtest.1 | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 4d3d3e6..33e85f0 100644
+diff --git a/doc/runtest.1 b/doc/runtest.1
+index d657652..5b87096 100644
+--- a/doc/runtest.1
++++ b/doc/runtest.1
+@@ -36,7 +36,7 @@ Prints out a help screen and then exits.
+ The configuration TRIPLET for the host system.
+ .TP
+ .BI --host_board \ NAME
+-The host board defintion to use.
++The host board definition to use.
+ .TP
+ .BI --ignore \ test1.exp\ test2.exp\ ...
+ Do not run the specified tests.
+-- 
+2.1.4
+
diff --git a/debian/patches/0003-lib-framework.exp-log_and_exit-Set-tool-to-testrun-i.patch b/debian/patches/0003-lib-framework.exp-log_and_exit-Set-tool-to-testrun-i.patch
new file mode 100644
index 0000000..5b876b0
--- /dev/null
+++ b/debian/patches/0003-lib-framework.exp-log_and_exit-Set-tool-to-testrun-i.patch
@@ -0,0 +1,31 @@
+From 3249854999143f1a0b728e812b26e1665ebfdb4b Mon Sep 17 00:00:00 2001
+From: Stephen Tridgell <stephen.tridgell at exablaze.com>
+Date: Wed, 18 Feb 2015 13:07:30 +1100
+Subject: [PATCH 3/4] 	* lib/framework.exp (log_and_exit): Set tool to
+ "testrun" if 	unset.
+
+Signed-off-by: Ben Elliston <bje at gnu.org>
+---
+ ChangeLog         | 5 +++++
+ lib/framework.exp | 3 +++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 33e85f0..2c2cd3e 100644
+diff --git a/lib/framework.exp b/lib/framework.exp
+index 32aaa74..4c3f014 100644
+--- a/lib/framework.exp
++++ b/lib/framework.exp
+@@ -368,6 +368,9 @@ proc log_and_exit {} {
+     cleanup
+     verbose -log "runtest completed at [timestamp -format %c]"
+     if {$mail_logs} {
++	if { ${tool} ==  "" } {
++	    set tool testrun
++	}
+ 	mail_file $outdir/$tool.sum $mailing_list "Dejagnu Summary Log"
+     }
+     remote_close host
+-- 
+2.1.4
+
diff --git a/debian/patches/0004-lib-target.exp-default_target_compile-Prepend-multil.patch b/debian/patches/0004-lib-target.exp-default_target_compile-Prepend-multil.patch
new file mode 100644
index 0000000..8d6426f
--- /dev/null
+++ b/debian/patches/0004-lib-target.exp-default_target_compile-Prepend-multil.patch
@@ -0,0 +1,44 @@
+From 5256bd82343000c76bc0e48139003f90b6184347 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools at gmail.com>
+Date: Thu, 26 Feb 2015 17:53:48 +1100
+Subject: [PATCH 4/4] 	* lib/target.exp (default_target_compile): Prepend
+ multilib_flags, 	instead of appending it.
+
+Some GCC testcases need explicit GCC options to properly run. For
+example gcc.target/i386/pr32219-1.c has -fpie specified explicitly:
+
+/* { dg-options "-O2 -fpie" } */
+
+But with multlib, eg:
+make check-gcc RUNTESTFLAGS="--target_board='unix{-fpic}'"
+
+-fpic is appended to the command line options, which overrides the command
+line options specified by dg-options.  multlib flags should be placed at
+the beginning of the command line options, not at the end.  This patch
+updates default_target_compile to prepend multilib_flags, instead of
+appending it.
+
+Signed-off-by: Ben Elliston <bje at gnu.org>
+---
+ ChangeLog      | 5 +++++
+ lib/target.exp | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 2c2cd3e..b91c825 100644
+diff --git a/lib/target.exp b/lib/target.exp
+index 71a78c7..30e4585 100644
+--- a/lib/target.exp
++++ b/lib/target.exp
+@@ -577,7 +577,7 @@ proc default_target_compile {source destfile type options} {
+     }
+ 
+     if {[board_info $dest exists multilib_flags]} {
+-	append add_flags " [board_info $dest multilib_flags]"
++	set add_flags "[board_info $dest multilib_flags] $add_flags"
+     }
+ 
+     verbose "doing compile"
+-- 
+2.1.4
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gdb/dejagnu.git