← Back to branch summary

~ubuntu-branches/debian/sid/gcc-4.8/sid

« back to all changes in this revision

Viewing changes to .svn/pristine/b5/b50e4d4d2dd4fe9afc8c24b9c43492aa38a480d7.svn-base

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-12-19 19:48:34 UTC
  • Revision ID: package-import@ubuntu.com-20141219194834-4dz1q7rrn5pad823
Tags: 4.8.4-1
* GCC 4.8.4 release.
  - Fix PR target/61407 (darwin), PR middle-end/58624 (ice),
    PR sanitizer/64265 (wrong code).
* Require recent binutils to pass go test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.svn/pristine/b5/b50e4d4d2dd4fe9afc8c24b9c43492aa38a480d7.svn-base
 
1
# DP: Set MULTILIB_DEFAULTS for ARM multilib builds
 
2
 
 
3
Index: b/src/gcc/config.gcc
 
4
===================================================================
 
5
--- a/src/gcc/config.gcc
 
6
+++ b/src/gcc/config.gcc
 
7
@@ -3229,10 +3229,18 @@
 
8
                esac
 
9
 
 
10
                case "$with_float" in
 
11
-               "" \
 
12
-               | soft | hard | softfp)
 
13
+               "")
 
14
                        # OK
 
15
                        ;;
 
16
+               soft)
 
17
+                       tm_defines="${tm_defines} TARGET_CONFIGURED_FLOAT_ABI=0"
 
18
+                       ;;
 
19
+               softfp)
 
20
+                       tm_defines="${tm_defines} TARGET_CONFIGURED_FLOAT_ABI=1"
 
21
+                       ;;
 
22
+               hard)
 
23
+                       tm_defines="${tm_defines} TARGET_CONFIGURED_FLOAT_ABI=2"
 
24
+                       ;;
 
25
                *)
 
26
                        echo "Unknown floating point type used in --with-float=$with_float" 1>&2
 
27
                        exit 1
 
28
@@ -3269,6 +3277,9 @@
 
29
                "" \
 
30
                | arm | thumb )
 
31
                        #OK
 
32
+                       if test "$with_mode" = thumb; then
 
33
+                               tm_defines="${tm_defines} TARGET_CONFIGURED_THUMB_MODE=1"
 
34
+                       fi
 
35
                        ;;
 
36
                *)
 
37
                        echo "Unknown mode used in --with-mode=$with_mode"
 
38
Index: b/src/gcc/config/arm/linux-eabi.h
 
39
===================================================================
 
40
--- a/src/gcc/config/arm/linux-eabi.h
 
41
+++ b/src/gcc/config/arm/linux-eabi.h
 
42
@@ -34,7 +34,21 @@
 
43
    target hardware.  If you override this to use the hard-float ABI then
 
44
    change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well.  */
 
45
 #undef  TARGET_DEFAULT_FLOAT_ABI
 
46
+#ifdef TARGET_CONFIGURED_FLOAT_ABI
 
47
+#if TARGET_CONFIGURED_FLOAT_ABI == 2
 
48
+#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
 
49
+#define MULTILIB_DEFAULT_FLOAT_ABI "mfloat-abi=hard"
 
50
+#elif TARGET_CONFIGURED_FLOAT_ABI == 1
 
51
+#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFTFP
 
52
+#define MULTILIB_DEFAULT_FLOAT_ABI "mfloat-abi=softfp"
 
53
+#else
 
54
+#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
 
55
+#define MULTILIB_DEFAULT_FLOAT_ABI "mfloat-abi=soft"
 
56
+#endif
 
57
+#else
 
58
 #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
 
59
+#define MULTILIB_DEFAULT_FLOAT_ABI "mfloat-abi=soft"
 
60
+#endif
 
61
 
 
62
 /* We default to the "aapcs-linux" ABI so that enums are int-sized by
 
63
    default.  */
 
64
@@ -77,6 +91,28 @@
 
65
     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
 
66
     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
 
67
 
 
68
+/* Set the multilib defaults according the configuration, needed to
 
69
+   let gcc -print-multi-dir do the right thing.  */
 
70
+
 
71
+#if TARGET_BIG_ENDIAN_DEFAULT
 
72
+#define MULTILIB_DEFAULT_ENDIAN "mbig-endian"
 
73
+#else
 
74
+#define MULTILIB_DEFAULT_ENDIAN "mlittle-endian"
 
75
+#endif
 
76
+
 
77
+#ifndef TARGET_CONFIGURED_THUMB_MODE
 
78
+#define MULTILIB_DEFAULT_MODE "marm"
 
79
+#elif TARGET_CONFIGURED_THUMB_MODE == 1
 
80
+#define MULTILIB_DEFAULT_MODE "mthumb"
 
81
+#else
 
82
+#define MULTILIB_DEFAULT_MODE "marm"
 
83
+#endif
 
84
+
 
85
+#undef  MULTILIB_DEFAULTS
 
86
+#define MULTILIB_DEFAULTS \
 
87
+       { MULTILIB_DEFAULT_MODE, MULTILIB_DEFAULT_ENDIAN, \
 
88
+         MULTILIB_DEFAULT_FLOAT_ABI, "mno-thumb-interwork" }
 
89
+
 
90
 /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
 
91
    use the GNU/Linux version, not the generic BPABI version.  */
 
92
 #undef  LINK_SPEC