[avr-libc-commit] [2372] * configure.ac (--with-debug-info): New option.

[Joerg Wunsch]

Revision: 2372
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2372
Author:   joerg_wunsch
Date:     2013-04-29 15:56:07 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
* configure.ac (--with-debug-info): New option.
* devtools/Device.am: Replace hard-coded debug information
options by CDEBUG or ASDEBUG, respectively.
* devtools/Architecture.am: (Dito.)
* doc/api/tools-install.dox: Document the new option here, too.

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/configure.ac
    trunk/avr-libc/devtools/Architecture.am
    trunk/avr-libc/devtools/Device.am
    trunk/avr-libc/doc/api/tools-install.dox

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2013-04-29 12:21:04 UTC (rev 2371)
+++ trunk/avr-libc/ChangeLog    2013-04-29 15:56:07 UTC (rev 2372)
@@ -1,5 +1,13 @@
 2013-04-29 Joerg Wunsch <address@hidden>
 
+       * configure.ac (--with-debug-info): New option.
+       * devtools/Device.am: Replace hard-coded debug information
+       options by CDEBUG or ASDEBUG, respectively.
+       * devtools/Architecture.am: (Dito.)
+       * doc/api/tools-install.dox: Document the new option here, too.
+
+2013-04-29 Joerg Wunsch <address@hidden>
+
        * devtools/findreg.xsl: Dig up EEPROM data, too.
        * devtools/ioreg.pl: Add EEPROM DWARF-2 template.
 

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2013-04-29 12:21:04 UTC (rev 2371)
+++ trunk/avr-libc/NEWS 2013-04-29 15:56:07 UTC (rev 2372)
@@ -30,9 +30,13 @@
     <inttypes.h>: SCNd8, SCNdLEAST8, SCNdFAST8, SCNi8, SCNiLEAST8,
     SCNiFAST8, SCNo8, SCNoLEAST8, SCNoFAST8, SCNu8, SCNuLEAST8,
     SCNuFAST8, SCNx8, SCNxLEAST8, SCNxFAST8
-    
+
   - Add time.h package, with 'ephemera'
 
+  - Introduce new configure option --with-debug-info=INFO, where INFO
+    can be either stabs, dwarf-2, or dwarf-4.  By default, no debug
+    information will be generated.
+
 *** Changes in avr-libc-1.8.0:
 
 * Bugs fixed:

Modified: trunk/avr-libc/configure.ac
===================================================================
--- trunk/avr-libc/configure.ac 2013-04-29 12:21:04 UTC (rev 2371)
+++ trunk/avr-libc/configure.ac 2013-04-29 15:56:07 UTC (rev 2372)
@@ -326,6 +326,31 @@
 AC_SUBST(AVR_LIBC_USER_MANUAL)
 AC_SUBST(DOC_INST_DIR)
 
+dnl Let the user decide which debug information to generate.
+dnl Default is nothing, suitable for binary distributions of the
+dnl compiled library.  Alternative options include stabs, dwarf-2,
+dnl or dwarf-4.
+AC_ARG_ENABLE(debug-info,
+[  --enable-debug-info=stabs|dwarf-2|dwarf-4  Enable generation of debugging 
information],
+[case "${enableval}" in
+  yes|dwarf2|dwarf-2) debuginfo=dwarf2 ;;
+  no)                 debuginfo="" ;;
+  stabs)              debuginfo=stabs ;;
+  dwarf4|dwarf-4)     debuginfo=dwarf4 ;;
+  *)                  AC_MSG_ERROR([bad value ${enableval} for 
--enable-debug-info option; should be either stabs, dwarf-2, or dwarf-4]) ;;
+ esac], [debuginfo=""])
+
+dnl Decide which debuginfo information to include
+case "$debuginfo" in
+"")      CDEBUG=""; ASDEBUG="" ;;
+stabs)   CDEBUG="-gstabs"; ASDEBUG="-Wa,-gstabs" ;;
+dwarf2)  CDEBUG="-gdwarf-2"; ASDEBUG="-Wa,-gdwarf-2" ;;
+dwarf4)  CDEBUG="-gdwarf-4"; ASDEBUG="-Wa,-gdwarf-2" ;;
+esac
+
+AC_SUBST(CDEBUG)
+AC_SUBST(ASDEBUG)
+
 FNO_JUMP_TABLES=""
 AC_SUBST(FNO_JUMP_TABLES)
 

Modified: trunk/avr-libc/devtools/Architecture.am
===================================================================
--- trunk/avr-libc/devtools/Architecture.am     2013-04-29 12:21:04 UTC (rev 
2371)
+++ trunk/avr-libc/devtools/Architecture.am     2013-04-29 15:56:07 UTC (rev 
2372)
@@ -47,9 +47,9 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/include 
-I$(top_builddir)/include
 
-AVRLIB_CFLAGS = -g -Wall -W -Wstrict-prototypes -mmcu=$(AVR_TARGET) 
$(AVR_TARGET_DEFS) $(AVR_TARGET_CFLAGS)
+AVRLIB_CFLAGS = @CDEBUG@ -Wall -W -Wstrict-prototypes -mmcu=$(AVR_TARGET) 
$(AVR_TARGET_DEFS) $(AVR_TARGET_CFLAGS)
 
-AVRLIB_ASFLAGS = -x assembler-with-cpp -Wa,-gstabs -mmcu=$(AVR_TARGET) 
$(AVR_TARGET_DEFS) $(AVR_TARGET_ASFLAGS)
+AVRLIB_ASFLAGS = -x assembler-with-cpp @ASDEBUG@ -mmcu=$(AVR_TARGET) 
$(AVR_TARGET_DEFS) $(AVR_TARGET_ASFLAGS)
 
 AM_CFLAGS = $(AVRLIB_CFLAGS)
 AM_CCASFLAGS = $(AM_CPPFLAGS) $(AVRLIB_ASFLAGS)

Modified: trunk/avr-libc/devtools/Device.am
===================================================================
--- trunk/avr-libc/devtools/Device.am   2013-04-29 12:21:04 UTC (rev 2371)
+++ trunk/avr-libc/devtools/Device.am   2013-04-29 15:56:07 UTC (rev 2372)
@@ -41,9 +41,9 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/include 
-I$(top_builddir)/include
 
-AVRLIB_CFLAGS = -gstabs -Wall -W -Wstrict-prototypes -mmcu=$(AVR_TARGET) 
$(AVR_TARGET_DEFS) $(AVR_TARGET_CFLAGS)
+AVRLIB_CFLAGS = @CDEBUG@ -Wall -W -Wstrict-prototypes -mmcu=$(AVR_TARGET) 
$(AVR_TARGET_DEFS) $(AVR_TARGET_CFLAGS)
 
-AVRLIB_ASFLAGS = -x assembler-with-cpp -Wa,-gstabs -mmcu=$(AVR_TARGET) 
$(AVR_TARGET_DEFS) $(AVR_TARGET_ASFLAGS)
+AVRLIB_ASFLAGS = -x assembler-with-cpp @ASDEBUG@ -mmcu=$(AVR_TARGET) 
$(AVR_TARGET_DEFS) $(AVR_TARGET_ASFLAGS)
 
 AM_CFLAGS = $(AVRLIB_CFLAGS)
 AM_CCASFLAGS = $(AM_CPPFLAGS) $(AVRLIB_ASFLAGS)

Modified: trunk/avr-libc/doc/api/tools-install.dox
===================================================================
--- trunk/avr-libc/doc/api/tools-install.dox    2013-04-29 12:21:04 UTC (rev 
2371)
+++ trunk/avr-libc/doc/api/tools-install.dox    2013-04-29 15:56:07 UTC (rev 
2372)
@@ -261,7 +261,23 @@
 $ make install
 \endverbatim
 
+Optionally, generation of debug information can be requested with:
 
+\verbatim
+$ gunzip -c avr-libc-<version>.tar.gz | tar xf -
+$ cd avr-libc-<version>
+$ ./configure --prefix=$PREFIX --build=`./config.guess` --host=avr \
+  --with-debug-info=DEBUG_INFO
+$ make
+$ make install
+\endverbatim
+
+where \c DEBUG_INFO can be one of \c stabs, \c dwarf-2, or \c dwarf-4.
+
+The default is to not generate any debug information, which is
+suitable for binary distributions of avr-libc, where the user does not
+have the source code installed the debug information would refer to.
+
 \section install_avrprog AVRDUDE
 \addindex installation, avrprog
 \addindex installation, avrdude