← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gcj-4.2/hardy-updates

« back to all changes in this revision

Viewing changes to debian/patches/i386-biarch.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-03-22 18:14:23 UTC
  • Revision ID: james.westby@ubuntu.com-20080322181423-5jxbzq2l7uadwgjk
Tags: 4.2.3-2ubuntu5
Upload as gcj-4.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/i386-biarch.dpatch
90
90
        * testsuite/lib/libgomp-dg.exp (libgomp_init): Don't add -march
91
91
        flag for i?86-*-* targets, if current target matches -m64.
92
92
 
93
 
--- libgomp/testsuite/lib/libgomp-dg.exp.orig   2007-07-04 16:19:18.000000000 +0200
94
 
+++ libgomp/testsuite/lib/libgomp-dg.exp        2008-02-25 23:17:21.589254540 +0100
95
 
@@ -57,6 +57,7 @@
96
 
     global lang_test_file
97
 
     global lang_library_path
98
 
     global lang_link_flags
99
 
+    global current_target_name
100
 
 
101
 
     set blddir [lookfor_file [get_multilibs] libgomp]
102
 
 
103
 
@@ -130,7 +131,7 @@
104
 
     }
105
 
 
106
 
     # We use atomic operations in the testcases to validate results.
107
 
-    if [istarget i?86-*-*] {
108
 
+    if { [istarget i?86-*-*] && [string match *-m64* $current_target_name] == -1} {
109
 
        lappend ALWAYS_CFLAGS "additional_flags=-march=i486"
110
 
     }
111
 
     if [istarget sparc*-*-*] {
112
93
--- libgomp/configure.tgt.orig  2007-07-04 16:19:19.000000000 +0200
113
94
+++ libgomp/configure.tgt       2008-02-25 23:17:21.589254540 +0100
114
95
@@ -49,9 +49,14 @@