diff options
author | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
---|---|---|
committer | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
commit | ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a (patch) | |
tree | 4a66b774bf493e95fc2961236de0ee84b4646362 /open_issues/binutils/sum.diff | |
parent | 42dc7198bbea79f4abe15d40804f539ffed1b05b (diff) | |
parent | 2e315ef11db39e8ee0a0decc054801521ee049dd (diff) |
fix merge conflict
Diffstat (limited to 'open_issues/binutils/sum.diff')
-rw-r--r-- | open_issues/binutils/sum.diff | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/open_issues/binutils/sum.diff b/open_issues/binutils/sum.diff index a466b82c..0c612411 100644 --- a/open_issues/binutils/sum.diff +++ b/open_issues/binutils/sum.diff @@ -1,9 +1,9 @@ ---- open_issues/binutils/sum_linux 2011-10-11 14:23:39.000000000 +0200 -+++ open_issues/binutils/sum_hurd 2011-10-11 14:23:33.000000000 +0200 +--- open_issues/binutils/sum_linux 2011-10-22 11:49:33.000000000 +0200 ++++ open_issues/binutils/sum_hurd 2011-10-22 11:23:09.000000000 +0200 @@ -1,5 +1,5 @@ --Test Run By thomas on Tue Oct 11 14:12:56 2011 +-Test Run By thomas on Sat Oct 22 11:43:32 2011 -Native configuration is i686-pc-linux-gnu -+Test Run By thomas on Tue Oct 11 13:36:51 2011 ++Test Run By thomas on Fri Oct 21 12:54:58 2011 +Native configuration is i686-unknown-gnu0.3 === binutils tests === @@ -12,9 +12,9 @@ # of expected passes 90 # of unsupported tests 3 --Test Run By thomas on Tue Oct 11 14:13:19 2011 +-Test Run By thomas on Sat Oct 22 11:43:59 2011 -Native configuration is i686-pc-linux-gnu -+Test Run By thomas on Tue Oct 11 13:38:54 2011 ++Test Run By thomas on Fri Oct 21 12:56:51 2011 +Native configuration is i686-unknown-gnu0.3 === ld tests === @@ -60,20 +60,20 @@ PASS: ELF DSO small bar (size) PASS: ELF DSO foo with small bar (size) PASS: ELF DSO big bar (size) -@@ -939,13 +939,13 @@ Running [...]/hurd/master/ld/testsuite/l +@@ -940,13 +940,13 @@ Running [...]/hurd/master/ld/testsuite/l === ld Summary === --# of expected passes 671 +-# of expected passes 672 -# of expected failures 8 -+# of expected passes 661 ++# of expected passes 662 +# of expected failures 18 # of untested testcases 6 - [...]/hurd/master.build/ld/ld-new 2.22.51.20111011 + [...]/hurd/master.build/ld/ld-new 2.22.51.20111021 --Test Run By thomas on Tue Oct 11 14:13:02 2011 +-Test Run By thomas on Sat Oct 22 11:43:38 2011 -Native configuration is i686-pc-linux-gnu -+Test Run By thomas on Tue Oct 11 13:37:18 2011 ++Test Run By thomas on Fri Oct 21 12:55:21 2011 +Native configuration is i686-unknown-gnu0.3 === gas tests === |