[avr-libc-commit] [2553] patch #9553: Fix some issues in libc/

[j]

Revision: 2553
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2553
Author:   joerg_wunsch
Date:     2021-05-20 17:50:20 -0400 (Thu, 20 May 2021)
Log Message:
-----------
patch #9553: Fix some issues in libc/
* libc/stdio/vfscanf.c (GETBYTE) [LPMx]: Early-clobber %0.
(GETBYTE) [default]: Use shorter instruction sequence.
* libc/stdio/vfprintf.c: Same.
(vfprintf): Fix build-warnings.
* libc/stdlib/dtostre.c (dtostre): Fix build warning.
* libc/stdlib/getenv.c (getenv): Fix build warning.

Ticket Links:
------------
    http://savannah.gnu.org/patch/?9553

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/libc/stdio/vfprintf.c
    trunk/avr-libc/libc/stdio/vfscanf.c
    trunk/avr-libc/libc/stdlib/dtostre.c
    trunk/avr-libc/libc/stdlib/getenv.c

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2021-05-20 20:25:20 UTC (rev 2552)
+++ trunk/avr-libc/ChangeLog    2021-05-20 21:50:20 UTC (rev 2553)
@@ -0,0 +1,9 @@
+2021-05-20 Georg-Johann Lay
+
+       patch #9553: Fix some issues in libc/
+       * libc/stdio/vfscanf.c (GETBYTE) [LPMx]: Early-clobber %0.
+       (GETBYTE) [default]: Use shorter instruction sequence.
+       * libc/stdio/vfprintf.c: Same.
+       (vfprintf): Fix build-warnings.
+       * libc/stdlib/dtostre.c (dtostre): Fix build warning.
+       * libc/stdlib/getenv.c (getenv): Fix build warning.

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2021-05-20 20:25:20 UTC (rev 2552)
+++ trunk/avr-libc/NEWS 2021-05-20 21:50:20 UTC (rev 2553)
@@ -36,6 +36,7 @@
   [#9187] [AVR_TINY]: Support 16-bit xtoa functons and more string functions.
   [#9400] Add avrxmega3 multilibs
   [#9659] Update eeprom_is_ready for avrxmega3 devices
+  [#9553] Fix some issues in libc/
 
 * Other changes:
 

Modified: trunk/avr-libc/libc/stdio/vfprintf.c
===================================================================
--- trunk/avr-libc/libc/stdio/vfprintf.c        2021-05-20 20:25:20 UTC (rev 
2552)
+++ trunk/avr-libc/libc/stdio/vfprintf.c        2021-05-20 21:50:20 UTC (rev 
2553)
@@ -79,7 +79,7 @@
        "lpm    %0,Z+   \n\t"                   \
        "sbrs   %2,%3   \n\t"                   \
        "ld     %0,Z+   "                       \
-       : "=r" (__c),                           \
+       : "=&r" (__c),                          \
          "+z" (pnt)                            \
        : "r" (flag),                           \
          "I" (ntz(mask))                       \
@@ -90,7 +90,6 @@
 # define GETBYTE(flag, mask, pnt)      ({      \
     unsigned char __c;                         \
     asm (                                      \
-       "sbrc   %2,%3   \n\t"                   \
        "lpm            \n\t"                   \
        "sbrs   %2,%3   \n\t"                   \
        "ld     r0,Z    \n\t"                   \
@@ -219,7 +218,7 @@
                goto ultoa;
              case 'p':
                flags |= FL_ALT;
-               /* no break */
+               /* fallthrough */
              case 'x':
                flags |= (FL_ALTHEX | FL_ALTLWR);
                base = 16;
@@ -618,7 +617,7 @@
                goto ultoa;
              case 'p':
                flags |= FL_ALT;
-               /* no break */
+               /* fallthrough */
              case 'x':
                if (flags & FL_ALT)
                    flags |= FL_ALTHEX;

Modified: trunk/avr-libc/libc/stdio/vfscanf.c
===================================================================
--- trunk/avr-libc/libc/stdio/vfscanf.c 2021-05-20 20:25:20 UTC (rev 2552)
+++ trunk/avr-libc/libc/stdio/vfscanf.c 2021-05-20 21:50:20 UTC (rev 2553)
@@ -129,7 +129,7 @@
        "lpm    %0,Z+   \n\t"                   \
        "sbrs   %2,%3   \n\t"                   \
        "ld     %0,Z+   "                       \
-       : "=r" (__c),                           \
+       : "=&r" (__c),                          \
          "+z" (pnt)                            \
        : "r" (flag),                           \
          "I" (_FFS(mask) - 1)                  \
@@ -140,7 +140,6 @@
 # define GETBYTE(flag, mask, pnt)      ({      \
     unsigned char __c;                         \
     asm (                                      \
-       "sbrc   %2,%3   \n\t"                   \
        "lpm            \n\t"                   \
        "sbrs   %2,%3   \n\t"                   \
        "ld     r0,Z    \n\t"                   \

Modified: trunk/avr-libc/libc/stdlib/dtostre.c
===================================================================
--- trunk/avr-libc/libc/stdlib/dtostre.c        2021-05-20 20:25:20 UTC (rev 
2552)
+++ trunk/avr-libc/libc/stdlib/dtostre.c        2021-05-20 21:50:20 UTC (rev 
2553)
@@ -49,7 +49,7 @@
     if (prec > 7) prec = 7;
     
     exp = __ftoa_engine (val, sbeg, prec, 0);
-    d = s = sbeg;
+    s = d = sbeg;
     vtype = *s++;
 
     if ((vtype & FTOA_MINUS) && !(vtype & FTOA_NAN))   /* like 'Glibc' */

Modified: trunk/avr-libc/libc/stdlib/getenv.c
===================================================================
--- trunk/avr-libc/libc/stdlib/getenv.c 2021-05-20 20:25:20 UTC (rev 2552)
+++ trunk/avr-libc/libc/stdlib/getenv.c 2021-05-20 21:50:20 UTC (rev 2553)
@@ -3,5 +3,6 @@
 char *
 getenv (const char *name)
 {
+  (void) name;
   return NULL;
 }