avr_toolchain_builder/pack/simulavr_patch1.patch

>From 85ce9cf2aa059c8ce22e0f7a82552a8a248f1ef3 Mon Sep 17 00:00:00 2001
From: panic <address@hidden>
Date: Mon, 19 Jun 2017 14:14:11 +0200
Subject: [PATCH 2/2] delete duplicate architecture definition

Previously, gcc threw errors similar to

  Fatal error: redefinition of mcu type `avr2' to `attiny25'

The mcu type is already defined via command line parameter -mmcu=.
Removing .arch from the source, avoids the redefinition and the
error.
---
 examples/verilog/Makefile.am     | 2 +-
 examples/verilog/right-unit.s    | 2 +-
 examples/verilog/singlepincomm.s | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/verilog/Makefile.am b/examples/verilog/Makefile.am
index a70941f..6a1aff1 100644
--- a/examples/verilog/Makefile.am
+++ b/examples/verilog/Makefile.am
@@ -54,7 +54,7 @@ vst.elf: vst.cpp
 
 
 .s.o:
-	$(AVR_GCC) -c -Wa,-gstabs -x assembler-with-cpp -o $@ $<
+	$(AVR_GCC) -mmcu=attiny25 -c -Wa,-gstabs -x assembler-with-cpp -o $@ $<
 
 left-unit.elf: left-unit.o csinglepincomm.o
 
diff --git a/examples/verilog/right-unit.s b/examples/verilog/right-unit.s
index f45d2b4..885b4ff 100644
--- a/examples/verilog/right-unit.s
+++ b/examples/verilog/right-unit.s
@@ -14,7 +14,7 @@
 // with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA..
 //  
-.arch ATTiny25
+
 #define __SFR_OFFSET 0
 	
 #define	__AVR_ATtiny25__	1
diff --git a/examples/verilog/singlepincomm.s b/examples/verilog/singlepincomm.s
index 088a359..2bd758c 100644
--- a/examples/verilog/singlepincomm.s
+++ b/examples/verilog/singlepincomm.s
@@ -23,7 +23,7 @@
 // warranty!
 //
 //-----------------------------------------------------------------------------
-.arch ATTiny25
+
 #define	__AVR_ATtiny25__	1
 #define __SFR_OFFSET 0
 #include <avr/io.h>
-- 
2.11.0