Index: binutils/testsuite/binutils-all/objcopy.exp
===================================================================
RCS file: /cvs/src/src/binutils/testsuite/binutils-all/objcopy.exp,v
retrieving revision 1.18
diff -c -3 -p -r1.18 objcopy.exp
*** binutils/testsuite/binutils-all/objcopy.exp	26 Aug 2002 23:14:35 -0000	1.18
--- binutils/testsuite/binutils-all/objcopy.exp	14 Nov 2002 14:23:18 -0000
*************** if ![string match "" $got] then {
*** 80,86 ****
      setup_xfail "m8*-*"
      setup_xfail "or32-*-rtems*" "or32-*-coff"
      setup_xfail "sh-*-coff*" "sh-*-rtems*" 
!     setup_xfail "tic80-*-*" "w65-*" "z8*-*"
  
      clear_xfail "hppa*64*-*-hpux*" "hppa*-*-linux*" "hppa*-*-lites*"
      clear_xfail "hppa*-*-*n*bsd*" "hppa*-*-rtems*" "*-*-*elf*" "m68*-*-sysv4*"
--- 80,86 ----
      setup_xfail "m8*-*"
      setup_xfail "or32-*-rtems*" "or32-*-coff"
      setup_xfail "sh-*-coff*" "sh-*-rtems*" 
!     setup_xfail "tic4x-*-*" "tic80-*-*" "w65-*" "z8*-*"
  
      clear_xfail "hppa*64*-*-hpux*" "hppa*-*-linux*" "hppa*-*-lites*"
      clear_xfail "hppa*-*-*n*bsd*" "hppa*-*-rtems*" "*-*-*elf*" "m68*-*-sysv4*"
Index: binutils/testsuite/binutils-all/objdump.exp
===================================================================
RCS file: /cvs/src/src/binutils/testsuite/binutils-all/objdump.exp,v
retrieving revision 1.13
diff -c -3 -p -r1.13 objdump.exp
*** binutils/testsuite/binutils-all/objdump.exp	28 Aug 2002 10:38:46 -0000	1.13
--- binutils/testsuite/binutils-all/objdump.exp	14 Nov 2002 14:23:18 -0000
*************** if ![regexp $want $got all text_name tex
*** 96,101 ****
--- 96,106 ----
      verbose "data name is $data_name size is $data_size"
      set ets 8
      set eds 4
+     # The [ti]c4x target has the property sizeof(char)=sizeof(long)=1
+     if [istarget *c4x*-*-*] then {
+         set ets 2
+         set eds 1
+     }
      # c54x section sizes are in bytes, not octets; adjust accordingly
      if [istarget *c54x*-*-*] then {
  	set ets 4
Index: gas/testsuite/gas/all/gas.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/all/gas.exp,v
retrieving revision 1.16
diff -c -3 -p -r1.16 gas.exp
*** gas/testsuite/gas/all/gas.exp	7 Nov 2002 09:20:10 -0000	1.16
--- gas/testsuite/gas/all/gas.exp	14 Nov 2002 14:23:18 -0000
*************** proc do_930509a {} {
*** 90,97 ****
  # C54x assembler (for compatibility) does not allow differences between
  # forward references
  # C30 counts a four byte offset as a difference of one.
! if { ![istarget hppa*-*-*]
!      && ![istarget *c30*-*-*] && ![istarget *c54x*-*-*] } then {
      # the vax fails because VMS can apparently actually handle this
      # case in relocs, so gas doesn't handle it itself.
      setup_xfail "h8300*-*-elf*" "mn10200*-*-*" "mn10300*-*-*" "vax*-*-vms*"
--- 90,99 ----
  # C54x assembler (for compatibility) does not allow differences between
  # forward references
  # C30 counts a four byte offset as a difference of one.
! if { ![istarget hppa*-*-*] &&
!      ![istarget *c30*-*-*] &&
!      ![istarget *c4x*-*-*] &&
!      ![istarget *c54x*-*-*] } then {
      # the vax fails because VMS can apparently actually handle this
      # case in relocs, so gas doesn't handle it itself.
      setup_xfail "h8300*-*-elf*" "mn10200*-*-*" "mn10300*-*-*" "vax*-*-vms*"
*************** if { ![istarget hppa*-*-*]
*** 102,107 ****
--- 104,110 ----
  # These directives are done in the c54x-specific tests instead
  case $target_triplet in {
      { hppa*-*-* } { }
+     { *c4x*-*-* } { }
      { *c54x*-*-* } { }
      default {
  	run_dump_test struct
*************** case $target_triplet in {
*** 115,121 ****
  # We omit the ARM toolchains because they define locals to
  #  start with '.', which eliminates .eos, .text etc from the output.
  # Omit c54x, since .tag and .def mean something different on that target
! if {   ([istarget *-*-coff*] && ![istarget m88*-*-*] && ![istarget *arm*-*-coff] && ![istarget thumb*-*-coff] && ![istarget xscale-*-coff] && ![istarget *c54x*-*-coff]) \
       ||([istarget *-*-pe*] && ![istarget arm*-*-pe*] && ![istarget thumb*-*-pe*]) \
       || [istarget a29k-*-udi*] \
       || [istarget a29k-*-ebmon*] \
--- 118,124 ----
  # We omit the ARM toolchains because they define locals to
  #  start with '.', which eliminates .eos, .text etc from the output.
  # Omit c54x, since .tag and .def mean something different on that target
! if {   ([istarget *-*-coff*] && ![istarget m88*-*-*] && ![istarget *arm*-*-coff] && ![istarget thumb*-*-coff] && ![istarget xscale-*-coff] && ![istarget *c4x*-*-coff] && ![istarget *c54x*-*-coff]) \
       ||([istarget *-*-pe*] && ![istarget arm*-*-pe*] && ![istarget thumb*-*-pe*]) \
       || [istarget a29k-*-udi*] \
       || [istarget a29k-*-ebmon*] \
*************** proc test_cond {} {
*** 158,163 ****
--- 161,167 ----
  # again, p2align doesn't work on c54x target
  case $target_triplet in {
      { hppa*-*-* } { }
+     { *c4x*-*-* } { }
      { *c54x*-*-* } { }
      default {
          test_cond
Index: gas/testsuite/gas/macros/macros.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/macros/macros.exp,v
retrieving revision 1.12
diff -c -3 -p -r1.12 macros.exp
*** gas/testsuite/gas/macros/macros.exp	5 Sep 2002 00:05:43 -0000	1.12
--- gas/testsuite/gas/macros/macros.exp	14 Nov 2002 14:23:18 -0000
*************** if { ![istarget hppa*-*-*] || [istarget 
*** 4,16 ****
      run_dump_test test1
  }
  
! if ![istarget *c54x*-*-*] {
      run_dump_test test2
  }
  
  run_dump_test test3
  
! if ![istarget *c54x*-*-*] {
      run_dump_test irp
      run_dump_test rept
  }
--- 4,16 ----
      run_dump_test test1
  }
  
! if { ![istarget *c54x*-*-*] && ![istarget *c4x*-*-*] } {
      run_dump_test test2
  }
  
  run_dump_test test3
  
! if { ![istarget *c54x*-*-*] && ![istarget *c4x*-*-*] } {
      run_dump_test irp
      run_dump_test rept
  }
*************** gas_test_error "err.s" "" "macro infinit
*** 20,32 ****
  
  case $target_triplet in {
      { hppa*-*-* } { if [istarget *-*-linux*] { run_dump_test semi } }
      { *c54x*-*-* } { }
      default {
  	run_dump_test semi
      }
  }
  
! if { ![istarget hppa*-*-*] || [istarget *-*-linux*]} {
      # FIXME: Due to macro mishandling of ONLY_STANDARD_ESCAPES.
      setup_xfail "avr-*" "cris-*"
  
--- 20,33 ----
  
  case $target_triplet in {
      { hppa*-*-* } { if [istarget *-*-linux*] { run_dump_test semi } }
+     { *c4x*-*-* } { }
      { *c54x*-*-* } { }
      default {
  	run_dump_test semi
      }
  }
  
! if { ![istarget hppa*-*-*] || [istarget *-*-linux*] } {
      # FIXME: Due to macro mishandling of ONLY_STANDARD_ESCAPES.
      setup_xfail "avr-*" "cris-*"
  
*************** if { ![istarget hppa*-*-*] || [istarget 
*** 36,41 ****
      setup_xfail "rs6000-*-*"
  
      # FIXME: Due to difference in what "consecutive octets" means.
!     setup_xfail "*c54x*-*"
      run_dump_test strings
  }
--- 37,42 ----
      setup_xfail "rs6000-*-*"
  
      # FIXME: Due to difference in what "consecutive octets" means.
!     setup_xfail "*c4x*-*-*" "*c54x*-*"
      run_dump_test strings
  }
Index: ld/testsuite/ld-scripts/script.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-scripts/script.exp,v
retrieving revision 1.5
diff -c -3 -p -r1.5 script.exp
*** ld/testsuite/ld-scripts/script.exp	24 Jul 2001 11:07:10 -0000	1.5
--- ld/testsuite/ld-scripts/script.exp	14 Nov 2002 14:23:18 -0000
*************** proc check_script { } {
*** 42,47 ****
--- 42,51 ----
  	} else {
  	    set text_end 0x104
  	    set data_end 0x1004
+             if [istarget *c4x*-*-*] then {
+                 set text_end 0x101
+                 set data_end 0x1001
+             }
  	    if [istarget *c54x*-*-*] then {
  		set text_end 0x102
  		set data_end 0x1002