2009-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>

	* dejagnu/boards/rtems-arm-edb7312.exp,
	dejagnu/boards/rtems-arm-nosim.exp,
	dejagnu/boards/rtems-avr-avrtest.exp,
	dejagnu/boards/rtems-avr-nosim.exp,
	dejagnu/boards/rtems-bfin-nosim.exp,
	dejagnu/boards/rtems-h8300-h8sim.exp,
	dejagnu/boards/rtems-i386-qemu.exp,
	dejagnu/boards/rtems-m32c-m32csim.exp,
	dejagnu/boards/rtems-m32r-m32rsim.exp,
	dejagnu/boards/rtems-m68k-nosim.exp,
	dejagnu/boards/rtems-mips-jmr3904.exp,
	dejagnu/boards/rtems-powerpc-psim.exp,
	dejagnu/boards/rtems-sh-simsh1.exp,
	dejagnu/boards/rtems-sparc-sis.exp: Recent changes require more
	variables to be included in board cflags and ldflags.

14 files changed, 28 insertions, 30 deletions

diff --git a/dejagnu/boards/rtems-arm-edb7312.exp b/dejagnu/boards/rtems-arm-edb7312.exp
index 7d2fc3e..7a3a418 100755
--- a/dejagnu/boards/rtems-arm-edb7312.exp
+++ b/dejagnu/boards/rtems-arm-edb7312.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-mcpu=arm7tdmi -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -mcpu=arm7tdmi -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-arm-nosim.exp b/dejagnu/boards/rtems-arm-nosim.exp
index c8f82a1..a22d5ec 100755
--- a/dejagnu/boards/rtems-arm-nosim.exp
+++ b/dejagnu/boards/rtems-arm-nosim.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-mcpu=arm7tdmi -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -mcpu=arm7tdmi -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-avr-avrtest.exp b/dejagnu/boards/rtems-avr-avrtest.exp
index 265a7fd..45bf3ad 100755
--- a/dejagnu/boards/rtems-avr-avrtest.exp
+++ b/dejagnu/boards/rtems-avr-avrtest.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-m5200 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -m5200 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-avr-nosim.exp b/dejagnu/boards/rtems-avr-nosim.exp
index 8bff208..b742237 100755
--- a/dejagnu/boards/rtems-avr-nosim.exp
+++ b/dejagnu/boards/rtems-avr-nosim.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-mmcu=atmega128 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -mmcu=atmega128 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-bfin-nosim.exp b/dejagnu/boards/rtems-bfin-nosim.exp
index cbc67f7..6432663 100755
--- a/dejagnu/boards/rtems-bfin-nosim.exp
+++ b/dejagnu/boards/rtems-bfin-nosim.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-h8300-h8sim.exp b/dejagnu/boards/rtems-h8300-h8sim.exp
index aa34d6b..850cc9b 100755
--- a/dejagnu/boards/rtems-h8300-h8sim.exp
+++ b/dejagnu/boards/rtems-h8300-h8sim.exp
@@ -18,9 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-mh -mint32 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems -DUNDERSCORES -Wl,-wrap,_exit -Wl,-wrap,_main -Wl,-wrap,_abort  -Wl,-wrap,_exit-Wl,-wrap,__exit "
-#" -Wl,-wrap,__exit -Wl,-wrap,_exit -Wl,-wrap,__exit -Wl,-wrap,_main -Wl,-wrap,_abort"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -mh -mint32 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems -DUNDERSCORES -Wl,-wrap,_exit -Wl,-wrap,_main -Wl,-wrap,_abort  -Wl,-wrap,_exit-Wl,-wrap,__exit "
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-i386-qemu.exp b/dejagnu/boards/rtems-i386-qemu.exp
index 3493f10..ef51704 100755
--- a/dejagnu/boards/rtems-i386-qemu.exp
+++ b/dejagnu/boards/rtems-i386-qemu.exp
@@ -37,8 +37,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ} -Wl,-Ttext,0x00100000"
+set_board_info cflags  "[newlib_include_flags] -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ} -Wl,-Ttext,0x00100000"
 # The simulator isn't really remote.
 set_board_info isremote 0
 
diff --git a/dejagnu/boards/rtems-m32c-m32csim.exp b/dejagnu/boards/rtems-m32c-m32csim.exp
index 700f035..acf697e 100755
--- a/dejagnu/boards/rtems-m32c-m32csim.exp
+++ b/dejagnu/boards/rtems-m32c-m32csim.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-mcpu=m32cm -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -mcpu=m32cm -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-m32r-m32rsim.exp b/dejagnu/boards/rtems-m32r-m32rsim.exp
index 6388e2e..8eda143 100755
--- a/dejagnu/boards/rtems-m32r-m32rsim.exp
+++ b/dejagnu/boards/rtems-m32r-m32rsim.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-m68k-nosim.exp b/dejagnu/boards/rtems-m68k-nosim.exp
index aaeb818..e3be64a 100755
--- a/dejagnu/boards/rtems-m68k-nosim.exp
+++ b/dejagnu/boards/rtems-m68k-nosim.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-m5200 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -m5200 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-mips-jmr3904.exp b/dejagnu/boards/rtems-mips-jmr3904.exp
index aa2806d..1dfbd29 100755
--- a/dejagnu/boards/rtems-mips-jmr3904.exp
+++ b/dejagnu/boards/rtems-mips-jmr3904.exp
@@ -19,9 +19,9 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems -march=r3900 -Wa,-xgot -G0"
+set_board_info cflags  "[newlib_include_flags] -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems -march=r3900 -Wa,-xgot -G0"
 
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info l[newlib_link_flags] dflags "${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-powerpc-psim.exp b/dejagnu/boards/rtems-powerpc-psim.exp
index 3267adf..3fee789 100755
--- a/dejagnu/boards/rtems-powerpc-psim.exp
+++ b/dejagnu/boards/rtems-powerpc-psim.exp
@@ -37,9 +37,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems -mcpu=603e"
- set_board_info cflags  "-B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems -mcpu=603e"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-sh-simsh1.exp b/dejagnu/boards/rtems-sh-simsh1.exp
index a730ddd..8f6ae2f 100755
--- a/dejagnu/boards/rtems-sh-simsh1.exp
+++ b/dejagnu/boards/rtems-sh-simsh1.exp
@@ -18,8 +18,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-m1 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -m1 -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems"
+set_board_info ldflags "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0
diff --git a/dejagnu/boards/rtems-sparc-sis.exp b/dejagnu/boards/rtems-sparc-sis.exp
index c5e8c3f..8570e4b 100755
--- a/dejagnu/boards/rtems-sparc-sis.exp
+++ b/dejagnu/boards/rtems-sparc-sis.exp
@@ -19,8 +19,8 @@ process_multilib_options ""
 # with what compiler is tested if we're testing gcc.
 set_board_info compiler  "[find_gcc]"
 
-set_board_info cflags  "-B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems -mcpu=cypress"
-set_board_info ldflags "${RTEMS_CONFIG_OBJ}"
+set_board_info cflags  "[newlib_include_flags] -B${RTEMS_MAKEFILE_PATH}/lib/ -specs bsp_specs -qrtems -mcpu=cypress"
+set_board_info ldflags  "[newlib_link_flags] ${RTEMS_CONFIG_OBJ}"
 
 # The simulator isn't really remote.
 set_board_info isremote 0