]> git.pld-linux.org Git - packages/crossavr-libc.git/blame - 503-avr-libc-headersio.patch
- cleanup, use arch*dir macros, release 5 (x32 rebuild)
[packages/crossavr-libc.git] / 503-avr-libc-headersio.patch
CommitLineData
9fe267c2 1diff -Naurp include/avr/io.h include/avr/io.h
69ed15f0
JR
2--- include/avr/io.h 2013-03-15 12:07:15.000000000 +0530
3+++ include/avr/io.h 2013-03-15 12:24:15.000000000 +0530
4@@ -202,20 +202,36 @@
9fe267c2
PZ
5 # include <avr/iom64a.h>
6 #elif defined (__AVR_ATmega640__)
7 # include <avr/iom640.h>
8-#elif defined (__AVR_ATmega644__) || defined (__AVR_ATmega644A__)
9+#elif defined (__AVR_ATmega644__)
10 # include <avr/iom644.h>
11+#elif (defined __AVR_ATmega644A__)
12+#include <avr/iom644a.h>
13 #elif defined (__AVR_ATmega644P__)
14 # include <avr/iom644p.h>
15 #elif defined (__AVR_ATmega644PA__)
16 # include <avr/iom644pa.h>
17-#elif defined (__AVR_ATmega645__) || defined (__AVR_ATmega645A__) || defined (__AVR_ATmega645P__)
18+#elif defined (__AVR_ATmega645__)
19 # include <avr/iom645.h>
20-#elif defined (__AVR_ATmega6450__) || defined (__AVR_ATmega6450A__) || defined (__AVR_ATmega6450P__)
21+#elif (defined __AVR_ATmega645A__)
22+#include <avr/iom645a.h>
23+#elif (defined __AVR_ATmega645P__)
24+#include <avr/iom645p.h>
25+#elif defined (__AVR_ATmega6450__)
26 # include <avr/iom6450.h>
27-#elif defined (__AVR_ATmega649__) || defined (__AVR_ATmega649A__)
28+#elif (defined __AVR_ATmega6450A__)
29+#include <avr/iom6450a.h>
30+#elif (defined __AVR_ATmega6450P__)
31+#include <avr/iom6450p.h>
32+#elif defined (__AVR_ATmega649__)
33 # include <avr/iom649.h>
34-#elif defined (__AVR_ATmega6490__) || defined (__AVR_ATmega6490A__) || defined (__AVR_ATmega6490P__)
35+#elif (defined __AVR_ATmega649A__)
36+#include <avr/iom649a.h>
37+#elif defined (__AVR_ATmega6490__)
38 # include <avr/iom6490.h>
39+#elif (defined __AVR_ATmega6490A__)
40+#include <avr/iom6490a.h>
41+#elif (defined __AVR_ATmega6490P__)
42+#include <avr/iom6490p.h>
43 #elif defined (__AVR_ATmega649P__)
44 # include <avr/iom649p.h>
45 #elif defined (__AVR_ATmega64HVE__)
69ed15f0 46@@ -230,34 +246,48 @@
9fe267c2
PZ
47 # include <avr/iom32a.h>
48 #elif defined (__AVR_ATmega323__)
49 # include <avr/iom323.h>
50-#elif defined (__AVR_ATmega324P__) || defined (__AVR_ATmega324A__)
51-# include <avr/iom324.h>
52+#elif defined (__AVR_ATmega324P__)
53+# include <avr/iom324p.h>
54+#elif (defined __AVR_ATmega324A__)
55+#include <avr/iom324a.h>
56 #elif defined (__AVR_ATmega324PA__)
57 # include <avr/iom324pa.h>
58-#elif defined (__AVR_ATmega325__) || defined (__AVR_ATmega325A__)
59+#elif defined (__AVR_ATmega325__)
60 # include <avr/iom325.h>
61+#elif (defined __AVR_ATmega325A__)
62+#include <avr/iom325a.h>
63 #elif defined (__AVR_ATmega325P__)
64-# include <avr/iom325.h>
65+# include <avr/iom325p.h>
66 #elif defined (__AVR_ATmega325PA__)
67 # include <avr/iom325pa.h>
68-#elif defined (__AVR_ATmega3250__) || defined (__AVR_ATmega3250A__)
69+#elif defined (__AVR_ATmega3250__)
70 # include <avr/iom3250.h>
71+#elif (defined __AVR_ATmega3250A__)
72+#include <avr/iom3250a.h>
73 #elif defined (__AVR_ATmega3250P__)
74-# include <avr/iom3250.h>
75+# include <avr/iom3250p.h>
76 #elif defined (__AVR_ATmega3250PA__)
77 # include <avr/iom3250pa.h>
78-#elif defined (__AVR_ATmega328P__) || defined (__AVR_ATmega328__)
79+#elif defined (__AVR_ATmega328P__)
80 # include <avr/iom328p.h>
81-#elif defined (__AVR_ATmega329__) || defined (__AVR_ATmega329A__)
82-# include <avr/iom329.h>
83-#elif defined (__AVR_ATmega329P__) || defined (__AVR_ATmega329PA__)
84+#elif (defined __AVR_ATmega328__)
85+#include <avr/iom328.h>
86+#elif defined (__AVR_ATmega329__)
87 # include <avr/iom329.h>
88-#elif defined (__AVR_ATmega3290__) || defined (__AVR_ATmega3290A__)
89+#elif (defined __AVR_ATmega329A__)
90+#include <avr/iom329a.h>
91+#elif defined (__AVR_ATmega329P__)
92+# include <avr/iom329p.h>
93+#elif (defined __AVR_ATmega329PA__)
94+#include <avr/iom329pa.h>
95+#elif (defined __AVR_ATmega3290PA__)
96+#include <avr/iom3290pa.h>
97+#elif defined (__AVR_ATmega3290__)
98 # include <avr/iom3290.h>
99+#elif (defined __AVR_ATmega3290A__)
100+#include <avr/iom3290a.h>
101 #elif defined (__AVR_ATmega3290P__)
102 # include <avr/iom3290.h>
103-#elif defined (__AVR_ATmega3290PA__)
104-# include <avr/iom3290pa.h>
105 #elif defined (__AVR_ATmega32HVB__)
106 # include <avr/iom32hvb.h>
107 #elif defined (__AVR_ATmega32HVBREVB__)
69ed15f0 108@@ -274,24 +304,32 @@
9fe267c2
PZ
109 # include <avr/iom162.h>
110 #elif defined (__AVR_ATmega163__)
111 # include <avr/iom163.h>
112-#elif defined (__AVR_ATmega164P__) || defined (__AVR_ATmega164A__)
113-# include <avr/iom164.h>
114+#elif defined (__AVR_ATmega164P__)
115+# include <avr/iom164p.h>
116+#elif (defined __AVR_ATmega164A__)
117+#include <avr/iom164a.h>
118 #elif defined (__AVR_ATmega164PA__)
119 # include <avr/iom164pa.h>
120-#elif defined (__AVR_ATmega165__) || defined (__AVR_ATmega165A__)
121+#elif defined (__AVR_ATmega165__)
122 # include <avr/iom165.h>
123+#elif (defined __AVR_ATmega165A__)
124+#include <avr/iom165a.h>
125 #elif defined (__AVR_ATmega165P__)
126 # include <avr/iom165p.h>
127 #elif defined (__AVR_ATmega165PA__)
128 # include <avr/iom165pa.h>
129-#elif defined (__AVR_ATmega168__) || defined (__AVR_ATmega168A__)
130+#elif defined (__AVR_ATmega168__)
131 # include <avr/iom168.h>
132+#elif (defined __AVR_ATmega168A__)
133+#include <avr/iom168a.h>
134 #elif defined (__AVR_ATmega168P__)
135 # include <avr/iom168p.h>
136 #elif defined (__AVR_ATmega168PA__)
137 # include <avr/iom168pa.h>
138-#elif defined (__AVR_ATmega169__) || defined (__AVR_ATmega169A__)
139+#elif defined (__AVR_ATmega169__)
140 # include <avr/iom169.h>
141+#elif (defined __AVR_ATmega169A__)
142+#include <avr/iom169a.h>
143 #elif defined (__AVR_ATmega169P__)
144 # include <avr/iom169p.h>
145 #elif defined (__AVR_ATmega169PA__)
69ed15f0 146@@ -310,14 +348,18 @@
9fe267c2
PZ
147 # include <avr/iom8.h>
148 #elif defined (__AVR_ATmega8A__)
149 # include <avr/iom8a.h>
150-#elif defined (__AVR_ATmega48__) || defined (__AVR_ATmega48A__)
151+#elif (defined __AVR_ATmega48A__)
152+# include <avr/iom48a.h>
153+#elif defined (__AVR_ATmega48__)
154 # include <avr/iom48.h>
155 #elif defined (__AVR_ATmega48PA__)
156 # include <avr/iom48pa.h>
157 #elif defined (__AVR_ATmega48P__)
158 # include <avr/iom48p.h>
159-#elif defined (__AVR_ATmega88__) || defined (__AVR_ATmega88A__)
160+#elif defined (__AVR_ATmega88__)
161 # include <avr/iom88.h>
162+#elif (defined __AVR_ATmega88A__)
163+# include <avr/iom88a.h>
164 #elif defined (__AVR_ATmega88P__)
165 # include <avr/iom88p.h>
166 #elif defined (__AVR_ATmega88PA__)
167diff -Naurp include/avr/Makefile.am include/avr/Makefile.am
69ed15f0
JR
168--- include/avr/Makefile.am 2013-03-15 12:07:15.000000000 +0530
169+++ include/avr/Makefile.am 2013-03-15 12:24:15.000000000 +0530
170@@ -94,14 +94,19 @@ avr_HEADERS = \
9fe267c2
PZ
171 iom162.h \
172 iom163.h \
173 iom164.h \
174+ iom164p.h \
175+ iom164a.h \
176 iom164pa.h \
177 iom165.h \
178+ iom165a.h \
179 iom165p.h \
180 iom165pa.h \
181 iom168.h \
182+ iom168a.h \
183 iom168p.h \
184 iom168pa.h \
185 iom169.h \
186+ iom169a.h \
187 iom169p.h \
188 iom169pa.h \
189 iom16hva.h \
69ed15f0 190@@ -119,15 +124,25 @@ avr_HEADERS = \
9fe267c2
PZ
191 iom32.h \
192 iom32a.h \
193 iom323.h \
194- iom324.h \
195+ iom324p.h \
196+ iom324a.h \
197 iom324pa.h \
198 iom325.h \
199+ iom325a.h \
200+ iom325p.h \
201 iom325pa.h \
202 iom3250.h \
203+ iom3250a.h \
204+ iom3250p.h \
205 iom3250pa.h \
206+ iom328.h \
207 iom328p.h \
208 iom329.h \
209+ iom329p.h \
210+ iom329a.h \
211+ iom329pa.h \
212 iom3290.h \
213+ iom3290a.h \
214 iom3290pa.h \
215 iom32hvb.h \
216 iom32hvbrevb.h \
69ed15f0 217@@ -136,6 +151,7 @@ avr_HEADERS = \
9fe267c2
PZ
218 iom32u2.h \
219 iom32u4.h \
220 iom32u6.h \
221+ iom48a.h \
222 iom48.h \
223 iom48pa.h \
224 iom48p.h \
69ed15f0 225@@ -144,13 +160,21 @@ avr_HEADERS = \
9fe267c2
PZ
226 iom64a.h \
227 iom640.h \
228 iom644.h \
229+ iom644a.h \
230 iom644p.h \
231 iom644pa.h \
232 iom645.h \
233+ iom645a.h \
234+ iom645p.h \
235 iom6450.h \
236+ iom6450a.h \
237+ iom6450p.h \
238 iom649.h \
239+ iom649a.h \
240 iom649p.h \
241 iom6490.h \
242+ iom6490a.h \
243+ iom6490p.h \
244 iom64c1.h \
245 iom64hve.h \
69ed15f0
JR
246 iom64hve2.h \
247@@ -162,6 +186,7 @@ avr_HEADERS = \
9fe267c2
PZ
248 iom8515.h \
249 iom8535.h \
250 iom88.h \
251+ iom88a.h \
252 iom88p.h \
253 iom88pa.h \
254 iom8hva.h \
This page took 0.13127 seconds and 4 git commands to generate.