← Back to branch summary

~ubuntu-branches/ubuntu/hoary/gcc-3.4/hoary

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2005-03-30 18:56:59 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050330185659-uk36efawadqyzmlw
Tags: 3.4.3-9ubuntu4
* Apply patch to fix PR c++/19311, taken from the 3.4 branch.
* Correctly fix libgcc_s_32.so symlink on amd64. Ubuntu #7099.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sparc-biarch.dpatch
 
1
#! /bin/sh -e
 
2
# 10_newpatch.dpatch by  <schizo@debian.org>
 
3
#
 
4
# DP: Enable biarch support for the 32bit sparc compiler
 
5
 
 
6
if [ $# -eq 3 ] && [ "$2" = '-d' ]; then
 
7
    pdir="-d $3"
 
8
    dir="$3/"
 
9
elif [ $# -ne 1 ]; then
 
10
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
11
    exit 1
 
12
fi
 
13
case "$1" in
 
14
    -patch)
 
15
        patch $pdir -f --no-backup-if-mismatch -p0 < $0;;
 
16
    -unpatch)
 
17
        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;;
 
18
    *)
 
19
        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
20
        exit 1;;
 
21
esac
 
22
 
 
23
exit 0
 
24
                                    
 
25
--- gcc/config/sparc/linux64.h  2003-03-13 08:40:33.000000000 +0000
 
26
+++ gcc/config/sparc/linux64.h  2003-03-13 08:46:18.000000000 +0000
 
27
@@ -37,8 +37,8 @@
 
28
    + MASK_STACK_BIAS + MASK_APP_REGS + MASK_FPU + MASK_LONG_DOUBLE_128)
 
29
 #endif
 
30
 
 
31
-#undef ASM_CPU_DEFAULT_SPEC
 
32
-#define ASM_CPU_DEFAULT_SPEC "-Av9a"
 
33
+#undef ASM_CPU64_DEFAULT_SPEC
 
34
+#define ASM_CPU64_DEFAULT_SPEC "-Av9a"
 
35
 
 
36
 #ifdef SPARC_BI_ARCH
 
37
 
 
38
--- gcc/config.gcc      2003-03-13 08:40:33.000000000 +0000
 
39
+++ gcc/config.gcc      2003-03-13 08:48:27.000000000 +0000
 
40
@@ -2383,8 +2383,18 @@
 
41
        gnu_ld=yes
 
42
        ;;
 
43
 sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
 
44
+       # If cpu is specified, assume we want a 32/64 compiler
 
45
+       if test x$with_cpu = x; then
 
46
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
 
47
        tmake_file="t-slibgcc-elf-ver t-linux sparc/t-crtfm"
 
48
+       else
 
49
+       tmake_file="t-slibgcc-elf-ver t-linux sparc/t-linux64 sparc/t-crtfm"
 
50
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
 
51
+       float_format=sparc
 
52
+       need_64bit_hwint=yes
 
53
+       fi
 
54
+       #tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
 
55
+       #tmake_file="t-slibgcc-elf-ver t-linux sparc/t-crtfm"
 
56
        ;;
 
57
 sparc-*-lynxos*)
 
58
        if test x$gas = xyes
 
59