Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-embedded/avr-libc/files: avr-libc-1.7.1-gcc46.patch
Date: Sat, 03 Sep 2011 08:40:28
Message-Id: 20110903084014.262DF20051@flycatcher.gentoo.org
1 radhermit 11/09/03 08:40:14
2
3 Added: avr-libc-1.7.1-gcc46.patch
4 Log:
5 Version bump. Apply fix for gcc-4.6 issue (bug #371043 by klondike).
6
7 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch?rev=1.1&content-type=text/plain
14
15 Index: avr-libc-1.7.1-gcc46.patch
16 ===================================================================
17 --- avr-libc-1.7.1.orig/include/avr/pgmspace.h
18 +++ avr-libc-1.7.1/include/avr/pgmspace.h
19 @@ -252,7 +252,7 @@
20 # define PSTR(s) ((const PROGMEM char *)(s))
21 #else /* !DOXYGEN */
22 /* The real thing. */
23 -# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); &__c[0];}))
24 +# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
25 #endif /* DOXYGEN */
26
27 #define __LPM_classic__(addr) \
28 --- avr-libc-1.7.1.orig/libc/stdlib/dtostre.c
29 +++ avr-libc-1.7.1/libc/stdlib/dtostre.c
30 @@ -37,9 +37,9 @@
31 char *
32 dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags)
33 {
34 - __attribute__((progmem)) static char str_nan[2][4] =
35 + __attribute__((progmem)) static const char str_nan[2][4] =
36 {"nan", "NAN"};
37 - __attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] =
38 + __attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])] =
39 {"inf", "INF"};
40 char *d; /* dst */
41 char *s; /* src */