diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-01 13:39:50 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-01 13:39:50 +0000 |
commit | e8a253ed34060f934df58c1f6f083cb726c55df1 (patch) | |
tree | 1b576389f48ed918210f7d23f532ae003eeefb71 /toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch | |
parent | ab30b059a12ea26a689b0c6577e09beedb2c1b34 (diff) |
[toolchain/gcc]: bump the 4.4 flavour to 4.4.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27337 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch')
-rw-r--r-- | toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch b/toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch new file mode 100644 index 000000000..78106619c --- /dev/null +++ b/toolchain/gcc/patches/4.4.6/933-avr32_bug_7435.patch @@ -0,0 +1,32 @@ +--- a/gcc/config/avr32/avr32.c ++++ b/gcc/config/avr32/avr32.c +@@ -243,14 +243,14 @@ void + avr32_override_options (void) + { + const struct part_type_s *part; +- const struct arch_type_s *arch; ++ const struct arch_type_s *arch, *part_arch; + + /*Add backward compability*/ + if (strcmp ("uc", avr32_arch_name)== 0) + { + fprintf (stderr, "Warning: Deprecated arch `%s' specified. " + "Please use '-march=ucr1' instead. " +- "Converting to arch 'ucr1'\n", ++ "Using arch 'ucr1'\n", + avr32_arch_name); + avr32_arch_name="ucr1"; + } +@@ -298,6 +298,12 @@ avr32_override_options (void) + if (!arch->name) + avr32_arch = &avr32_arch_types[avr32_part->arch_type]; + ++ /* When architecture implied by -mpart and one passed in -march are ++ * conflicting, issue an error message */ ++ part_arch = &avr32_arch_types[avr32_part->arch_type]; ++ if (strcmp("none",avr32_part_name) && strcmp("none", avr32_arch_name) && strcmp(avr32_arch_name,part_arch->name)) ++ error ("Conflicting architectures implied by -mpart and -march\n"); ++ + /* If optimization level is two or greater, then align start of loops to a + word boundary since this will allow folding the first insn of the loop. + Do this only for targets supporting branch prediction. */ |