[RFA:] Don't use multilib strings in libgloss/m32r/trapmon0.c

Hans-Peter Nilsson hp@bitrange.com
Sat Apr 13 06:06:00 GMT 2002


Multi-line string literals are deprecated in gcc-3.1 and are
removed from GCC trunk, so some fix is needed.  Here's one I've
been using for a while.  Please tell if ok to commit.

libgloss:
2002-04-13  Hans-Peter Nilsson  <hp@bitrange.com>

	* m32r/trapmon0.c (__trap0): Don't use multi-line strings.

brgds, H-P
-------------- next part --------------
Index: trapmon0.c
===================================================================
RCS file: /cvs/src/src/libgloss/m32r/trapmon0.c,v
retrieving revision 1.1
diff -p -c -r1.1 trapmon0.c
*** trapmon0.c	17 Mar 2000 22:48:50 -0000	1.1
--- trapmon0.c	13 Apr 2002 12:46:03 -0000
*************** int __trap0 (int function, int p1, int p
*** 14,22 ****
    case SYS_exit:
      /* loop so GDB can't go past system exit call */
      while (1) {
!       asm volatile (" 
!           ldi	  r0, #0
!           trap    #15        ; return control to Mon2000");
      }
      break;
  
--- 14,22 ----
    case SYS_exit:
      /* loop so GDB can't go past system exit call */
      while (1) {
!       asm volatile (
!           "ldi	  r0, #0						\n"
!           "trap    #15        ; return control to Mon2000");
      }
      break;
  
*************** int __trap0 (int function, int p1, int p
*** 25,39 ****
      int i;
  
      for( i=0; i<p3; i++ ) {
!       asm volatile (" 
!           ldi   r0, #2
!           ldi   r1, #15      ; load Ctrl-O (ASCII 15)
!           trap  #15          ; write Ctrl-O for quoting purposes" );
  
!       asm volatile (" 
!           ldi   r0, #2
!           ldb   r1, %0
!           trap  #15          ; write character to console" 
            : /* no outputs */
            : "m" (((char*)p2)[i]));
      }
--- 25,39 ----
      int i;
  
      for( i=0; i<p3; i++ ) {
!       asm volatile (
!           "ldi   r0, #2							\n"
!           "ldi   r1, #15      ; load Ctrl-O (ASCII 15)			\n"
!           "trap  #15          ; write Ctrl-O for quoting purposes" );
  
!       asm volatile (
!           "ldi   r0, #2							\n"
!           "ldb   r1, %0							\n"
!           "trap  #15          ; write character to console" 
            : /* no outputs */
            : "m" (((char*)p2)[i]));
      }


More information about the Newlib mailing list