[avr-libc-commit] [2544] patch #9400: Add avrxmega3 multilibs

[pitchumani . sivanupandi]

Revision: 2544
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2544
Author:   pitchumani
Date:     2017-08-04 04:50:27 -0400 (Fri, 04 Aug 2017)
Log Message:
-----------
patch #9400: Add avrxmega3 multilibs

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

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/configure.ac
    trunk/avr-libc/devtools/gen-avr-lib-tree.sh
    trunk/avr-libc/include/avr/pgmspace.h

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2017-06-16 20:59:33 UTC (rev 2543)
+++ trunk/avr-libc/ChangeLog    2017-08-04 08:50:27 UTC (rev 2544)
@@ -1,3 +1,16 @@
+2017-07-05  Georg-Johann Lay <address@hidden>
+
+       patch #9400: Add multilib support for avrxmega3 + avrxmega3/short-calls.
+       * configure.ac (CHECK_AVR_DEVICE): Add one for avrxmega3.
+       (AM_CONDITIONAL): Add one for HAS_avrxmega3.
+       (AC_CONFIG_FILES): Add avr/lib/avrxmega3/Makefile,
+       avr/lib/avrxmega3/short-calls/Makefile.
+       * devtools/gen-avr-lib-tree.sh (CFLAGS_SHORT_CALLS): New.
+       (AVRXMEGA3_DEV_INFO): New.
+       (AVRXMEGA3SC_DEV_INFO): New.
+       (AVR_ARH_INFO): Add entries avrxmega3, avrxmega3/short-calls.
+       * include/avr/pgmspace.h (__AVR_HAVE_RAMPD__): Fix comment.
+
 2017-06-16  Joerg Wunsch <address@hidden>
 
        * doc/api/faq.dox (faq_reg_usage): Document differences for

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2017-06-16 20:59:33 UTC (rev 2543)
+++ trunk/avr-libc/NEWS 2017-08-04 08:50:27 UTC (rev 2544)
@@ -32,6 +32,7 @@
   [#8536] Fix a typo within <stdio.h>
   [#8649] small documentation fixes in
   [#9187] [AVR_TINY]: Support 16-bit xtoa functons and more string functions.
+  [#9400] Add avrxmega3 multilibs
 
 * Other changes:
 

Modified: trunk/avr-libc/configure.ac
===================================================================
--- trunk/avr-libc/configure.ac 2017-06-16 20:59:33 UTC (rev 2543)
+++ trunk/avr-libc/configure.ac 2017-08-04 08:50:27 UTC (rev 2544)
@@ -1124,6 +1124,11 @@
 AM_CONDITIONAL(HAS_atxmega32e5, test "x$HAS_atxmega32e5" = "xyes")
 
 
+# avrxmega3
+CHECK_AVR_DEVICE(avrxmega3)
+AM_CONDITIONAL(HAS_avrxmega3, test "x$HAS_avrxmega3" = "xyes")
+
+
 # avrxmega4
 CHECK_AVR_DEVICE(avrxmega4)
 AM_CONDITIONAL(HAS_avrxmega4, test "x$HAS_avrxmega4" = "xyes")
@@ -1571,6 +1576,16 @@
        avr/lib/avrxmega2/atxmega32e5/Makefile
 ])
 
+# avrxmega3
+AC_CONFIG_FILES([
+       avr/lib/avrxmega3/Makefile
+])
+
+# avrxmega3/short-calls
+AC_CONFIG_FILES([
+       avr/lib/avrxmega3/short-calls/Makefile
+])
+
 # avrxmega4
 AC_CONFIG_FILES([
        avr/lib/avrxmega4/Makefile

Modified: trunk/avr-libc/devtools/gen-avr-lib-tree.sh
===================================================================
--- trunk/avr-libc/devtools/gen-avr-lib-tree.sh 2017-06-16 20:59:33 UTC (rev 
2543)
+++ trunk/avr-libc/devtools/gen-avr-lib-tree.sh 2017-08-04 08:50:27 UTC (rev 
2544)
@@ -47,6 +47,7 @@
 
 CFLAGS_SPACE="-mcall-prologues -Os"
 CFLAGS_TINY_STACK="-msp8 -mcall-prologues -Os"
+CFLAGS_SHORT_CALLS="-mshort-calls -mcall-prologues -Os"
 CFLAGS_BIG_MEMORY='-Os $(FNO_JUMP_TABLES)'
 CFLAGS_SPEED="-Os"
 
@@ -302,6 +303,12 @@
 atxmega32e5:crtx32e5.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\
 "
 
+AVRXMEGA3_DEV_INFO="\
+"
+
+AVRXMEGA3SC_DEV_INFO="\
+"
+
 AVRXMEGA4_DEV_INFO="\
 atxmega64a3:crtx64a3.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\
 atxmega64a3u:crtx64a3u.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\
@@ -371,6 +378,8 @@
 avr51::AVR51_DEV_INFO:${LIB_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\
 avr6::AVR6_DEV_INFO:${LIB_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\
 avrxmega2::AVRXMEGA2_DEV_INFO:${LIB_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\
+avrxmega3::AVRXMEGA3_DEV_INFO:${LIB_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\
+avrxmega3:short-calls:AVRXMEGA3SC_DEV_INFO:${LIB_DEFS}:${CFLAGS_SHORT_CALLS}:${DEV_ASFLAGS};\
 avrxmega4::AVRXMEGA4_DEV_INFO:${LIB_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\
 avrxmega5::AVRXMEGA5_DEV_INFO:${LIB_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\
 avrxmega6::AVRXMEGA6_DEV_INFO:${LIB_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\

Modified: trunk/avr-libc/include/avr/pgmspace.h
===================================================================
--- trunk/avr-libc/include/avr/pgmspace.h       2017-06-16 20:59:33 UTC (rev 
2543)
+++ trunk/avr-libc/include/avr/pgmspace.h       2017-08-04 08:50:27 UTC (rev 
2544)
@@ -892,8 +892,8 @@
 }))
 
 /*
-Check for architectures that implement RAMPD (avrxmega3, avrxmega5,
-avrxmega7) as they need to save/restore RAMPZ for ELPM macros so it does
+Check for architectures that implement RAMPD (avrxmega5, avrxmega7)
+as they need to save/restore RAMPZ for ELPM macros so it does
 not interfere with data accesses.
 */
 #if defined (__AVR_HAVE_RAMPD__)