Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: ports/gcc-avr/nacl.patch

Issue 1212553002: Fixing avr-gcc link errors due to incorrect assumptions in the spec file about avr-libc directory s… (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/gcc-avr/nacl.patch
diff --git a/ports/gcc-avr/nacl.patch b/ports/gcc-avr/nacl.patch
index 6879b7fd2864addf195eedd7ead0e2ec4426d551..03a211d7ea1800236b3e1cc0bfa4982eaec9100f 100644
--- a/ports/gcc-avr/nacl.patch
+++ b/ports/gcc-avr/nacl.patch
@@ -43,6 +43,31 @@ diff --git a/gcc/collect2.c b/gcc/collect2.c
{
enum linker_select
{
+diff --git a/gcc/config/avr/gen-avr-mmcu-specs.c b/gcc/config/avr/gen-avr-mmcu-specs.c
+--- a/gcc/config/avr/gen-avr-mmcu-specs.c
++++ b/gcc/config/avr/gen-avr-mmcu-specs.c
+@@ -165,6 +165,13 @@ print_mcu (const avr_mcu_t *mcu)
+ if (is_device)
+ fprintf (f, "%s\n", help_copy_paste);
+
++ // The code below creates specs which make the wrong assumptions about the
++ // directory structure supplied by avr-libc as of gcc 5.0. This is due to
++ // vendor specific changes to the AVR backend, avr-libc not yet adjusted to
++ // the new layout.
++ // As per http://savannah.nongnu.org/bugs/?44869, gcc 5.2.0 onwards will be
++ // compatible with avr-libc
++/*
+ #if defined (WITH_AVRLIBC)
+ // AVR-LibC specific. See avrlibc.h for the specs using them as subspecs.
+
+@@ -179,6 +186,7 @@ print_mcu (const avr_mcu_t *mcu)
+ fprintf (f, "\n\n");
+ }
+ #endif // WITH_AVRLIBC
++*/
+
+ // avr-gcc specific specs for the compilation / the compiler proper.
+
diff --git a/gcc/config/i386/cpuid.h b/gcc/config/i386/cpuid.h
--- a/gcc/config/i386/cpuid.h
+++ b/gcc/config/i386/cpuid.h
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698