Home Explore Help
Register Sign In
wareck
/
avr_toolchain_builder
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
avr_toolchain_b...
/
pack
/
avr-binutils-size-2.32.patch

avr-binutils-size-2.32.patch 16 KB
Permalink History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523 
  1. AVR only; support -C for AVR memory usage
    2. 

  2. 

  3. Source: http://git.makehackvoid.com/cgi-bin/gitweb.cgi?p=mhvavrtools.git;a=blob_plain;f=mhvavrtools/patches/binutils-001-avr-size.patch;h=e80d28eae46217551d996a2253256c97d10aa4b5;hb=refs/heads/master
    4. 

  4. ===========================================================
    5. 

  5. --- binutils/size.c	2007-08-06 13:56:14.000000000 -0600
    6. 

  6. +++ binutils/size.c	2007-09-13 09:13:10.281250000 -0600
    7. 

  7. @@ -36,10 +36,31 @@
    8. 

  8.  #include "getopt.h"
    9. 

  9.  #include "bucomm.h"
    10. 

  10.  
    11. 

  11. -#ifndef BSD_DEFAULT
    12. 

  12. -#define BSD_DEFAULT 1
    13. 

  13. +typedef enum
    14. 

  14. +{
    15. 

  15. +    format_sysv = 0,
    16. 

  16. +    format_bsd = 1,
    17. 

  17. +    format_avr = 2,
    18. 

  18. +} format_type_t;
    19. 

  19. +
    20. 

  20. +
    21. 

  21. +/* Set the default format. */
    22. 

  22. +#define FORMAT_DEFAULT_SYSV 0
    23. 

  23. +#define FORMAT_DEFAULT_BSD 1
    24. 

  24. +#define FORMAT_DEFAULT_AVR 0
    25. 

  25. +
    26. 

  26. +#if FORMAT_DEFAULT_SYSV
    27. 

  27. +    #define FORMAT_DEFAULT format_sysv
    28. 

  28. +    #define FORMAT_NAME "sysv"
    29. 

  29. +#elif FORMAT_DEFAULT_BSD
    30. 

  30. +    #define FORMAT_DEFAULT format_bsd
    31. 

  31. +    #define FORMAT_NAME "berkeley"
    32. 

  32. +#elif FORMAT_DEFAULT_AVR
    33. 

  33. +    #define FORMAT_DEFAULT format_avr
    34. 

  34. +    #define FORMAT_NAME "avr"
    35. 

  35.  #endif
    36. 

  36.  
    37. 

  37. +
    38. 

  38.  /* Program options.  */
    39. 

  39.  
    40. 

  40.  static enum
    41. 

  41. @@ -48,9 +69,8 @@ static enum
    42. 

  42.    }
    43. 

  43.  radix = decimal;
    44. 

  44.  
    45. 

  45. -/* 0 means use AT&T-style output.  */
    46. 

  46. -static int berkeley_format = BSD_DEFAULT;
    47. 

  47.  
    48. 

  48. +format_type_t format = FORMAT_DEFAULT;
    49. 

  49.  static int show_version = 0;
    50. 

  50.  static int show_help = 0;
    51. 

  51.  static int show_totals = 0;
    52. 

  52. @@ -64,6 +84,246 @@ static bfd_size_type total_textsize;
    53. 

  53.  /* Program exit status.  */
    54. 

  54.  static int return_code = 0;
    55. 

  55.  
    56. 

  56. +
    57. 

  57. +/* AVR Size specific stuff */
    58. 

  58. +
    59. 

  59. +#define AVR64 64UL
    60. 

  60. +#define AVR128 128UL
    61. 

  61. +#define AVR256 256UL
    62. 

  62. +#define AVR512 512UL
    63. 

  63. +#define AVR1K 1024UL
    64. 

  64. +#define AVR2K 2048UL
    65. 

  65. +#define AVR4K 4096UL
    66. 

  66. +#define AVR8K 8192UL
    67. 

  67. +#define AVR16K 16384UL
    68. 

  68. +#define AVR20K 20480UL
    69. 

  69. +#define AVR24K 24576UL
    70. 

  70. +#define AVR32K 32768UL
    71. 

  71. +#define AVR36K 36864UL
    72. 

  72. +#define AVR40K 40960UL
    73. 

  73. +#define AVR64K 65536UL
    74. 

  74. +#define AVR68K 69632UL
    75. 

  75. +#define AVR128K 131072UL
    76. 

  76. +#define AVR136K 139264UL
    77. 

  77. +#define AVR200K 204800UL
    78. 

  78. +#define AVR256K 262144UL
    79. 

  79. +#define AVR264K 270336UL
    80. 

  80. +
    81. 

  81. +typedef struct
    82. 

  82. +{
    83. 

  83. +    char *name;
    84. 

  84. +	long flash;
    85. 

  85. +	long ram;
    86. 

  86. +	long eeprom;
    87. 

  87. +} avr_device_t;
    88. 

  88. +
    89. 

  89. +avr_device_t avr[] =
    90. 

  90. +{
    91. 

  91. +	{"atxmega256a3",  AVR264K, AVR16K, AVR4K},
    92. 

  92. +	{"atxmega256a3b", AVR264K, AVR16K, AVR4K},
    93. 

  93. +	{"atxmega256d3",  AVR264K, AVR16K, AVR4K},
    94. 

  94. +
    95. 

  95. +	{"atmega2560",    AVR256K, AVR8K,  AVR4K},
    96. 

  96. +	{"atmega2561",    AVR256K, AVR8K,  AVR4K},
    97. 

  97. +
    98. 

  98. +	{"atxmega192a3",  AVR200K, AVR16K, AVR2K},
    99. 

  99. +	{"atxmega192d3",  AVR200K, AVR16K, AVR2K},
    100. 

  100. +
    101. 

  101. +	{"atxmega128a1",  AVR136K, AVR8K,  AVR2K},
    102. 

  102. +	{"atxmega128a1u", AVR136K, AVR8K,  AVR2K},
    103. 

  103. +	{"atxmega128a3",  AVR136K, AVR8K,  AVR2K},
    104. 

  104. +	{"atxmega128d3",  AVR136K, AVR8K,  AVR2K},
    105. 

  105. +
    106. 

  106. +	{"at43usb320",    AVR128K, 608UL,  0UL},
    107. 

  107. +	{"at90can128",    AVR128K, AVR4K,  AVR4K},
    108. 

  108. +	{"at90usb1286",   AVR128K, AVR8K,  AVR4K},
    109. 

  109. +	{"at90usb1287",   AVR128K, AVR8K,  AVR4K},
    110. 

  110. +	{"atmega128",     AVR128K, AVR4K,  AVR4K},
    111. 

  111. +	{"atmega1280",    AVR128K, AVR8K,  AVR4K},
    112. 

  112. +	{"atmega1281",    AVR128K, AVR8K,  AVR4K},
    113. 

  113. +	{"atmega1284p",   AVR128K, AVR16K, AVR4K},
    114. 

  114. +	{"atmega128rfa1", AVR128K, AVR16K, AVR4K},
    115. 

  115. +	{"atmega103",     AVR128K, 4000UL, AVR4K},
    116. 

  116. +
    117. 

  117. +	{"atxmega64a1",   AVR68K,  AVR4K,  AVR2K},
    118. 

  118. +	{"atxmega64a1u",  AVR68K,  AVR4K,  AVR2K},
    119. 

  119. +	{"atxmega64a3",   AVR68K,  AVR4K,  AVR2K},
    120. 

  120. +	{"atxmega64d3",   AVR68K,  AVR4K,  AVR2K},
    121. 

  121. +
    122. 

  122. +	{"at90can64",     AVR64K,  AVR4K,  AVR2K},
    123. 

  123. +	{"at90scr100",    AVR64K,  AVR4K,  AVR2K},
    124. 

  124. +	{"at90usb646",    AVR64K,  AVR4K,  AVR2K},
    125. 

  125. +	{"at90usb647",    AVR64K,  AVR4K,  AVR2K},
    126. 

  126. +	{"atmega64",      AVR64K,  AVR4K,  AVR2K},
    127. 

  127. +	{"atmega640",     AVR64K,  AVR8K,  AVR4K},
    128. 

  128. +	{"atmega644",     AVR64K,  AVR4K,  AVR2K},
    129. 

  129. +	{"atmega644a",    AVR64K,  AVR4K,  AVR2K},
    130. 

  130. +	{"atmega644p",    AVR64K,  AVR4K,  AVR2K},
    131. 

  131. +	{"atmega644pa",   AVR64K,  AVR4K,  AVR2K},
    132. 

  132. +	{"atmega645",     AVR64K,  AVR4K,  AVR2K},
    133. 

  133. +	{"atmega645a",    AVR64K,  AVR4K,  AVR2K},
    134. 

  134. +	{"atmega645p",    AVR64K,  AVR4K,  AVR2K},
    135. 

  135. +	{"atmega6450",    AVR64K,  AVR4K,  AVR2K},
    136. 

  136. +	{"atmega6450a",   AVR64K,  AVR4K,  AVR2K},
    137. 

  137. +	{"atmega6450p",   AVR64K,  AVR4K,  AVR2K},
    138. 

  138. +	{"atmega649",     AVR64K,  AVR4K,  AVR2K},
    139. 

  139. +	{"atmega649a",    AVR64K,  AVR4K,  AVR2K},
    140. 

  140. +	{"atmega649p",    AVR64K,  AVR4K,  AVR2K},
    141. 

  141. +	{"atmega6490",    AVR64K,  AVR4K,  AVR2K},
    142. 

  142. +	{"atmega6490a",   AVR64K,  AVR4K,  AVR2K},
    143. 

  143. +	{"atmega6490p",   AVR64K,  AVR4K,  AVR2K},
    144. 

  144. +	{"atmega64c1",    AVR64K,  AVR4K,  AVR2K},
    145. 

  145. +	{"atmega64hve",   AVR64K,  AVR4K,  AVR1K},
    146. 

  146. +	{"atmega64m1",    AVR64K,  AVR4K,  AVR2K},
    147. 

  147. +   {"m3000",         AVR64K,  AVR4K,  0UL},
    148. 

  148. +
    149. 

  149. +	{"atmega406",     AVR40K,  AVR2K,  AVR512},
    150. 

  150. +
    151. 

  151. +	{"atxmega32a4",   AVR36K,  AVR4K,  AVR1K},
    152. 

  152. +	{"atxmega32d4",   AVR36K,  AVR4K,  AVR1K},
    153. 

  153. +
    154. 

  154. +	{"at90can32",     AVR32K,  AVR2K,  AVR1K},
    155. 

  155. +	{"at94k",         AVR32K,  AVR4K,  0UL},
    156. 

  156. +	{"atmega32",      AVR32K,  AVR2K,  AVR1K},
    157. 

  157. +	{"atmega323",     AVR32K,  AVR2K,  AVR1K},
    158. 

  158. +	{"atmega324a",    AVR32K,  AVR2K,  AVR1K},
    159. 

  159. +	{"atmega324p",    AVR32K,  AVR2K,  AVR1K},
    160. 

  160. +	{"atmega324pa",   AVR32K,  AVR2K,  AVR1K},
    161. 

  161. +	{"atmega325",     AVR32K,  AVR2K,  AVR1K},
    162. 

  162. +	{"atmega325a",    AVR32K,  AVR2K,  AVR1K},
    163. 

  163. +	{"atmega325p",    AVR32K,  AVR2K,  AVR1K},
    164. 

  164. +	{"atmega3250",    AVR32K,  AVR2K,  AVR1K},
    165. 

  165. +	{"atmega3250a",   AVR32K,  AVR2K,  AVR1K},
    166. 

  166. +	{"atmega3250p",   AVR32K,  AVR2K,  AVR1K},
    167. 

  167. +	{"atmega328",     AVR32K,  AVR2K,  AVR1K},
    168. 

  168. +	{"atmega328p",    AVR32K,  AVR2K,  AVR1K},
    169. 

  169. +	{"atmega329",     AVR32K,  AVR2K,  AVR1K},
    170. 

  170. +	{"atmega329a",    AVR32K,  AVR2K,  AVR1K},
    171. 

  171. +	{"atmega329p",    AVR32K,  AVR2K,  AVR1K},
    172. 

  172. +	{"atmega329pa",   AVR32K,  AVR2K,  AVR1K},
    173. 

  173. +	{"atmega3290",    AVR32K,  AVR2K,  AVR1K},
    174. 

  174. +	{"atmega3290a",   AVR32K,  AVR2K,  AVR1K},
    175. 

  175. +	{"atmega3290p",   AVR32K,  AVR2K,  AVR1K},
    176. 

  176. +	{"atmega32hvb",   AVR32K,  AVR2K,  AVR1K},
    177. 

  177. +	{"atmega32c1",    AVR32K,  AVR2K,  AVR1K},
    178. 

  178. +   {"atmega32hvb",   AVR32K,  AVR2K,  AVR1K},
    179. 

  179. +	{"atmega32m1",    AVR32K,  AVR2K,  AVR1K},
    180. 

  180. +	{"atmega32u2",    AVR32K,  AVR1K,  AVR1K},
    181. 

  181. +	{"atmega32u4",    AVR32K,  2560UL, AVR1K},
    182. 

  182. +	{"atmega32u6",    AVR32K,  2560UL, AVR1K},
    183. 

  183. +
    184. 

  184. +	{"at43usb355",    AVR24K,  1120UL,   0UL},
    185. 

  185. +
    186. 

  186. +	{"atxmega16a4",   AVR20K,  AVR2K,  AVR1K},
    187. 

  187. +	{"atxmega16d4",   AVR20K,  AVR2K,  AVR1K},
    188. 

  188. +
    189. 

  189. +	{"at76c711",      AVR16K,  AVR2K,  0UL},
    190. 

  190. +	{"at90pwm216",    AVR16K,  AVR1K,  AVR512},
    191. 

  191. +	{"at90pwm316",    AVR16K,  AVR1K,  AVR512},
    192. 

  192. +	{"at90usb162",    AVR16K,  AVR512, AVR512},
    193. 

  193. +	{"atmega16",      AVR16K,  AVR1K,  AVR512},
    194. 

  194. +	{"atmega16a",     AVR16K,  AVR1K,  AVR512},
    195. 

  195. +	{"atmega161",     AVR16K,  AVR1K,  AVR512},
    196. 

  196. +	{"atmega162",     AVR16K,  AVR1K,  AVR512},
    197. 

  197. +	{"atmega163",     AVR16K,  AVR1K,  AVR512},
    198. 

  198. +	{"atmega164",     AVR16K,  AVR1K,  AVR512},
    199. 

  199. +	{"atmega164a",    AVR16K,  AVR1K,  AVR512},
    200. 

  200. +	{"atmega164p",    AVR16K,  AVR1K,  AVR512},
    201. 

  201. +	{"atmega165a",    AVR16K,  AVR1K,  AVR512},
    202. 

  202. +	{"atmega165",     AVR16K,  AVR1K,  AVR512},
    203. 

  203. +	{"atmega165p",    AVR16K,  AVR1K,  AVR512},
    204. 

  204. +	{"atmega168",     AVR16K,  AVR1K,  AVR512},
    205. 

  205. +	{"atmega168a",    AVR16K,  AVR1K,  AVR512},
    206. 

  206. +	{"atmega168p",    AVR16K,  AVR1K,  AVR512},
    207. 

  207. +	{"atmega169",     AVR16K,  AVR1K,  AVR512},
    208. 

  208. +	{"atmega169a",    AVR16K,  AVR1K,  AVR512},
    209. 

  209. +	{"atmega169p",    AVR16K,  AVR1K,  AVR512},
    210. 

  210. +	{"atmega169pa",   AVR16K,  AVR1K,  AVR512},
    211. 

  211. +	{"atmega16hva",   AVR16K,  768UL,  AVR256},
    212. 

  212. +	{"atmega16hva2",  AVR16K,  AVR1K,  AVR256},
    213. 

  213. +   {"atmega16hvb",   AVR16K,  AVR1K,  AVR512},
    214. 

  214. +	{"atmega16m1",    AVR16K,  AVR1K,  AVR512},
    215. 

  215. +	{"atmega16u2",    AVR16K,  AVR512, AVR512},
    216. 

  216. +	{"atmega16u4",    AVR16K,  1280UL, AVR512},
    217. 

  217. +	{"attiny167",     AVR16K,  AVR512, AVR512},
    218. 

  218. +
    219. 

  219. +	{"at90c8534",     AVR8K,   352UL,  AVR512},
    220. 

  220. +	{"at90pwm1",      AVR8K,   AVR512, AVR512},
    221. 

  221. +	{"at90pwm2",      AVR8K,   AVR512, AVR512},
    222. 

  222. +	{"at90pwm2b",     AVR8K,   AVR512, AVR512},
    223. 

  223. +	{"at90pwm3",      AVR8K,   AVR512, AVR512},
    224. 

  224. +	{"at90pwm3b",     AVR8K,   AVR512, AVR512},
    225. 

  225. +	{"at90pwm81",     AVR8K,   AVR256, AVR512},
    226. 

  226. +	{"at90s8515",     AVR8K,   AVR512, AVR512},
    227. 

  227. +	{"at90s8535",     AVR8K,   AVR512, AVR512},
    228. 

  228. +	{"at90usb82",     AVR8K,   AVR512, AVR512},
    229. 

  229. +	{"ata6289",       AVR8K,   AVR512, 320UL},
    230. 

  230. +	{"atmega8",       AVR8K,   AVR1K,  AVR512},
    231. 

  231. +	{"atmega8515",    AVR8K,   AVR512, AVR512},
    232. 

  232. +	{"atmega8535",    AVR8K,   AVR512, AVR512},
    233. 

  233. +	{"atmega88",      AVR8K,   AVR1K,  AVR512},
    234. 

  234. +	{"atmega88a",     AVR8K,   AVR1K,  AVR512},
    235. 

  235. +	{"atmega88p",     AVR8K,   AVR1K,  AVR512},
    236. 

  236. +	{"atmega88pa",    AVR8K,   AVR1K,  AVR512},
    237. 

  237. +	{"atmega8hva",    AVR8K,   768UL,  AVR256},
    238. 

  238. +	{"atmega8u2",     AVR8K,   AVR512, AVR512},
    239. 

  239. +	{"attiny84",      AVR8K,   AVR512, AVR512},
    240. 

  240. +	{"attiny84a",     AVR8K,   AVR512, AVR512},
    241. 

  241. +	{"attiny85",      AVR8K,   AVR512, AVR512},
    242. 

  242. +	{"attiny861",     AVR8K,   AVR512, AVR512},
    243. 

  243. +	{"attiny861a",    AVR8K,   AVR512, AVR512},
    244. 

  244. +	{"attiny87",      AVR8K,   AVR512, AVR512},
    245. 

  245. +	{"attiny88",      AVR8K,   AVR512, AVR64},
    246. 

  246. +
    247. 

  247. +	{"at90s4414",     AVR4K,   352UL,  AVR256},
    248. 

  248. +	{"at90s4433",     AVR4K,   AVR128, AVR256},
    249. 

  249. +	{"at90s4434",     AVR4K,   352UL,  AVR256},
    250. 

  250. +	{"atmega48",      AVR4K,   AVR512, AVR256},
    251. 

  251. +	{"atmega48a",     AVR4K,   AVR512, AVR256},
    252. 

  252. +	{"atmega48p",     AVR4K,   AVR512, AVR256},
    253. 

  253. +	{"attiny4313",    AVR4K,   AVR256, AVR256},
    254. 

  254. +	{"attiny43u",     AVR4K,   AVR256, AVR64},
    255. 

  255. +	{"attiny44",      AVR4K,   AVR256, AVR256},
    256. 

  256. +	{"attiny44a",     AVR4K,   AVR256, AVR256},
    257. 

  257. +	{"attiny45",      AVR4K,   AVR256, AVR256},
    258. 

  258. +	{"attiny461",     AVR4K,   AVR256, AVR256},
    259. 

  259. +	{"attiny461a",    AVR4K,   AVR256, AVR256},
    260. 

  260. +	{"attiny48",      AVR4K,   AVR256, AVR64},
    261. 

  261. +
    262. 

  262. +	{"at86rf401",     AVR2K,   224UL,  AVR128},
    263. 

  263. +	{"at90s2313",     AVR2K,   AVR128, AVR128},
    264. 

  264. +	{"at90s2323",     AVR2K,   AVR128, AVR128},
    265. 

  265. +	{"at90s2333",     AVR2K,   224UL,  AVR128},
    266. 

  266. +	{"at90s2343",     AVR2K,   AVR128, AVR128},
    267. 

  267. +   {"attiny20",      AVR2K,   AVR128, 0UL},
    268. 

  268. +	{"attiny22",      AVR2K,   224UL,  AVR128},
    269. 

  269. +	{"attiny2313",    AVR2K,   AVR128, AVR128},
    270. 

  270. +	{"attiny2313a",   AVR2K,   AVR128, AVR128},
    271. 

  271. +	{"attiny24",      AVR2K,   AVR128, AVR128},
    272. 

  272. +	{"attiny24a",     AVR2K,   AVR128, AVR128},
    273. 

  273. +	{"attiny25",      AVR2K,   AVR128, AVR128},
    274. 

  274. +	{"attiny26",      AVR2K,   AVR128, AVR128},
    275. 

  275. +	{"attiny261",     AVR2K,   AVR128, AVR128},
    276. 

  276. +	{"attiny261a",    AVR2K,   AVR128, AVR128},
    277. 

  277. +	{"attiny28",      AVR2K,   0UL,    0UL},
    278. 

  278. +   {"attiny40",      AVR2K,   AVR256, 0UL},
    279. 

  279. +
    280. 

  280. +	{"at90s1200",     AVR1K,   0UL,    AVR64},
    281. 

  281. +   {"attiny9",       AVR1K,   32UL,   0UL},
    282. 

  282. +   {"attiny10",      AVR1K,   32UL,   0UL},
    283. 

  283. +	{"attiny11",      AVR1K,   0UL,    AVR64},
    284. 

  284. +	{"attiny12",      AVR1K,   0UL,    AVR64},
    285. 

  285. +	{"attiny13",      AVR1K,   AVR64,  AVR64},
    286. 

  286. +	{"attiny13a",     AVR1K,   AVR64,  AVR64},
    287. 

  287. +	{"attiny15",      AVR1K,   0UL,    AVR64},
    288. 

  288. +
    289. 

  289. +   {"attiny4",       AVR512,  32UL,   0UL},
    290. 

  290. +   {"attiny5",       AVR512,  32UL,   0UL},
    291. 

  291. +};
    292. 

  292. +
    293. 

  293. +static char *avrmcu = NULL;
    294. 

  294. +
    295. 

  295. +
    296. 

  296.  static char *target = NULL;
    297. 

  297.  
    298. 

  298.  /* Forward declarations.  */
    299. 

  299. @@ -79,7 +337,8 @@ usage (FILE *stream, int status)
    300. 

  300.    fprintf (stream, _(" Displays the sizes of sections inside binary files\n"));
    301. 

  301.    fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n"));
    302. 

  302.    fprintf (stream, _(" The options are:\n\
    303. 

  303. -  -A|-B     --format={sysv|berkeley}  Select output style (default is %s)\n\
    304. 

  304. +  -A|-B|-C  --format={sysv|berkeley|avr}  Select output style (default is %s)\n\
    305. 

  305. +            --mcu=<avrmcu>            MCU name for AVR format only\n\
    306. 

  306.    -o|-d|-x  --radix={8|10|16}         Display numbers in octal, decimal or hex\n\
    307. 

  307.    -t        --totals                  Display the total sizes (Berkeley only)\n\
    308. 

  308.              --common                  Display total size for *COM* syms\n\
    309. 

  309. @@ -88,11 +337,7 @@ usage (FILE *stream, int status)
    310. 

  310.    -h        --help                    Display this information\n\
    311. 

  311.    -v        --version                 Display the program's version\n\
    312. 

  312.  \n"),
    313. 

  313. -#if BSD_DEFAULT
    314. 

  314. -  "berkeley"
    315. 

  315. -#else
    316. 

  316. -  "sysv"
    317. 

  317. -#endif
    318. 

  318. +FORMAT_NAME
    319. 

  319.  );
    320. 

  320.    list_supported_targets (program_name, stream);
    321. 

  321.    if (REPORT_BUGS_TO[0] && status == 0)
    322. 

  322. @@ -103,6 +359,7 @@ usage (FILE *stream, int status)
    323. 

  323.  #define OPTION_FORMAT (200)
    324. 

  324.  #define OPTION_RADIX (OPTION_FORMAT + 1)
    325. 

  325.  #define OPTION_TARGET (OPTION_RADIX + 1)
    326. 

  326. +#define OPTION_MCU (OPTION_TARGET + 1) 
    327. 

  327.  
    328. 

  328.  static struct option long_options[] =
    329. 

  329.  {
    330. 

  330. @@ -110,6 +368,7 @@ static struct option long_options[] =
    331. 

  331.    {"format", required_argument, 0, OPTION_FORMAT},
    332. 

  332.    {"radix", required_argument, 0, OPTION_RADIX},
    333. 

  333.    {"target", required_argument, 0, OPTION_TARGET},
    334. 

  334. +  {"mcu", required_argument, 0, 203},
    335. 

  335.    {"totals", no_argument, &show_totals, 1},
    336. 

  336.    {"version", no_argument, &show_version, 1},
    337. 

  337.    {"help", no_argument, &show_help, 1},
    338. 

  338. @@ -141,7 +399,7 @@ main (int argc, char **argv)
    339. 

  339.    bfd_init ();
    340. 

  340.    set_default_bfd_target ();
    341. 

  341.  
    342. 

  342. -  while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options,
    343. 

  343. +  while ((c = getopt_long (argc, argv, "ABCHhVvdfotx", long_options,
    344. 

  344.  			   (int *) 0)) != EOF)
    345. 

  345.      switch (c)
    346. 

  346.        {
    347. 

  347. @@ -150,11 +409,15 @@ main (int argc, char **argv)
    348. 

  348.  	  {
    349. 

  349.  	  case 'B':
    350. 

  350.  	  case 'b':
    351. 

  351. -	    berkeley_format = 1;
    352. 

  352. +	    format = format_bsd;
    353. 

  353.  	    break;
    354. 

  354.  	  case 'S':
    355. 

  355.  	  case 's':
    356. 

  356. -	    berkeley_format = 0;
    357. 

  357. +	    format = format_sysv;
    358. 

  358. +	    break;
    359. 

  359. +	  case 'A':
    360. 

  360. +	  case 'a':
    361. 

  361. +	    format = format_avr;
    362. 

  362.  	    break;
    363. 

  363.  	  default:
    364. 

  364.  	    non_fatal (_("invalid argument to --format: %s"), optarg);
    365. 

  365. @@ -162,6 +424,10 @@ main (int argc, char **argv)
    366. 

  366.  	  }
    367. 

  367.  	break;
    368. 

  368.  
    369. 

  369. +      case OPTION_MCU:
    370. 

  370. +	avrmcu = optarg;
    371. 

  371. +	break;
    372. 

  372. +
    373. 

  373.        case OPTION_TARGET:
    374. 

  374.  	target = optarg;
    375. 

  375.  	break;
    376. 

  376. @@ -190,11 +457,14 @@ main (int argc, char **argv)
    377. 

  377.  	break;
    378. 

  378.  
    379. 

  379.        case 'A':
    380. 

  380. -	berkeley_format = 0;
    381. 

  381. +	format = format_sysv;
    382. 

  382.  	break;
    383. 

  383.        case 'B':
    384. 

  384. -	berkeley_format = 1;
    385. 

  385. +	format = format_bsd;
    386. 

  386.  	break;
    387. 

  387. +      case 'C':
    388. 

  388. +    format = format_avr;
    389. 

  389. +    break;
    390. 

  390.        case 'v':
    391. 

  391.        case 'V':
    392. 

  392.  	show_version = 1;
    393. 

  393. @@ -240,7 +509,7 @@ main (int argc, char **argv)
    394. 

  394.      for (; optind < argc;)
    395. 

  395.        display_file (argv[optind++]);
    396. 

  396.  
    397. 

  397. -  if (show_totals && berkeley_format)
    398. 

  398. +  if (show_totals && format == format_bsd)
    399. 

  399.      {
    400. 

  400.        bfd_size_type total = total_textsize + total_datasize + total_bsssize;
    401. 

  401.  
    402. 

  402. @@ -599,13 +869,117 @@ print_sysv_format (bfd *file)
    403. 

  403.    printf ("\n\n");
    404. 

  404.  }
    405. 

  405.  
    406. 

  406. +
    407. 

  407. +static avr_device_t *
    408. 

  408. +avr_find_device (void)
    409. 

  409. +{
    410. 

  410. +  unsigned int i;
    411. 

  411. +  if (avrmcu != NULL)
    412. 

  412. +  {
    413. 

  413. +    for (i = 0; i < sizeof(avr) / sizeof(avr[0]); i++)
    414. 

  414. +    {
    415. 

  415. +      if (strcmp(avr[i].name, avrmcu) == 0)
    416. 

  416. +      {
    417. 

  417. +        /* Match found */
    418. 

  418. +        return (&avr[i]);
    419. 

  419. +      }
    420. 

  420. +    }
    421. 

  421. +  }
    422. 

  422. +  return (NULL);
    423. 

  423. +}
    424. 

  424. +
    425. 

  425. +
    426. 

  426. +
    427. 

  427. +static void
    428. 

  428. +print_avr_format (bfd *file)
    429. 

  429. +{
    430. 

  430. +  char *avr_name = "Unknown";
    431. 

  431. +  int flashmax = 0;
    432. 

  432. +  int rammax = 0;
    433. 

  433. +  int eeprommax = 0;
    434. 

  434. +  asection *section; 
    435. 

  435. +  bfd_size_type my_datasize = 0;
    436. 

  436. +  bfd_size_type my_textsize = 0;
    437. 

  437. +  bfd_size_type my_bsssize = 0;
    438. 

  438. +  bfd_size_type bootloadersize = 0;
    439. 

  439. +  bfd_size_type noinitsize = 0;
    440. 

  440. +  bfd_size_type eepromsize = 0;
    441. 

  441. +
    442. 

  442. +  avr_device_t *avrdevice = avr_find_device();
    443. 

  443. +  if (avrdevice != NULL)
    444. 

  444. +  {
    445. 

  445. +    avr_name = avrdevice->name;
    446. 

  446. +    flashmax = avrdevice->flash;
    447. 

  447. +    rammax = avrdevice->ram;
    448. 

  448. +    eeprommax = avrdevice->eeprom;
    449. 

  449. +  }
    450. 

  450. +
    451. 

  451. +  if ((section = bfd_get_section_by_name (file, ".data")) != NULL)
    452. 

  452. +    my_datasize = bfd_section_size (file, section);
    453. 

  453. +  if ((section = bfd_get_section_by_name (file, ".text")) != NULL)
    454. 

  454. +    my_textsize = bfd_section_size (file, section);
    455. 

  455. +  if ((section = bfd_get_section_by_name (file, ".bss")) != NULL)
    456. 

  456. +    my_bsssize = bfd_section_size (file, section);
    457. 

  457. +  if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL)
    458. 

  458. +    bootloadersize = bfd_section_size (file, section);
    459. 

  459. +  if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL)
    460. 

  460. +    noinitsize = bfd_section_size (file, section);
    461. 

  461. +  if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL)
    462. 

  462. +    eepromsize = bfd_section_size (file, section);
    463. 

  463. +  
    464. 

  464. +  bfd_size_type text = my_textsize + my_datasize + bootloadersize;
    465. 

  465. +  bfd_size_type data = my_datasize + my_bsssize + noinitsize;
    466. 

  466. +  bfd_size_type eeprom = eepromsize;
    467. 

  467. +  
    468. 

  468. +  printf ("AVR Memory Usage\n"
    469. 

  469. +          "----------------\n"
    470. 

  470. +          "Device: %s\n\n", avr_name);
    471. 

  471. +  
    472. 

  472. +  /* Text size */
    473. 

  473. +  printf ("Program:%8ld bytes", text);
    474. 

  474. +  if (flashmax > 0)
    475. 

  475. +  {
    476. 

  476. +    printf (" (%2.1f%% Full)", ((float)text / flashmax) * 100);
    477. 

  477. +  }
    478. 

  478. +  printf ("\n(.text + .data + .bootloader)\n\n");
    479. 

  479. +  
    480. 

  480. +  /* Data size */
    481. 

  481. +  printf ("Data:   %8ld bytes", data);
    482. 

  482. +  if (rammax > 0)
    483. 

  483. +  {
    484. 

  484. +    printf (" (%2.1f%% Full)", ((float)data / rammax) * 100);
    485. 

  485. +  }
    486. 

  486. +  printf ("\n(.data + .bss + .noinit)\n\n");
    487. 

  487. +  
    488. 

  488. +  /* EEPROM size */
    489. 

  489. +  if (eeprom > 0) 
    490. 

  490. +  { 
    491. 

  491. +    printf ("EEPROM: %8ld bytes", eeprom);
    492. 

  492. +    if (eeprommax > 0)
    493. 

  493. +    {
    494. 

  494. +      printf (" (%2.1f%% Full)", ((float)eeprom / eeprommax) * 100);
    495. 

  495. +    }
    496. 

  496. +    printf ("\n(.eeprom)\n\n");
    497. 

  497. +  }
    498. 

  498. +}
    499. 

  499. +
    500. 

  500. +
    501. 

  501.  static void
    502. 

  502.  print_sizes (bfd *file)
    503. 

  503.  {
    504. 

  504.    if (show_common)
    505. 

  505.      calculate_common_size (file);
    506. 

  506. -  if (berkeley_format)
    507. 

  507. -    print_berkeley_format (file);
    508. 

  508. -  else
    509. 

  509. -    print_sysv_format (file);
    510. 

  510. +  switch (format)
    511. 

  511. +  {
    512. 

  512. +    case format_sysv:
    513. 

  513. +      print_sysv_format (file);
    514. 

  514. +      break;
    515. 

  515. +    case format_bsd:
    516. 

  516. +      print_berkeley_format (file);
    517. 

  517. +      break;
    518. 

  518. +    case format_avr:
    519. 

  519. +    default:
    520. 

  520. +      print_avr_format (file);
    521. 

  521. +      break;
    522. 

  522. +  }
    523. 

  523.  }
    524.