[PATCH] m32r: Remove m32rsim references
Aun-Ali Zaidi
admin at kodeit.net
Mon Dec 14 03:38:15 UTC 2015
closes #2447.
---
dejagnu/boards/rtems-m32r-m32rsim.exp | 40 ----------------------------------
gcc/RTEMS_GCC_Testing.txt | 2 +-
gcc/do_one | 1 -
gcc/parallelize_build | 2 +-
gcc/rundeja | 6 -----
gcc/test_driver | 2 +-
gcc/testsuite/ada/acats/Makefile.rtems | 3 ---
rtems/bit_all_bsps | 2 +-
sim-scripts/.gitignore | 2 --
sim-scripts/Makefile | 5 +----
sim-scripts/m32rsim.in | 25 ---------------------
11 files changed, 5 insertions(+), 85 deletions(-)
delete mode 100755 dejagnu/boards/rtems-m32r-m32rsim.exp
delete mode 100644 sim-scripts/m32rsim.in
diff --git a/dejagnu/boards/rtems-m32r-m32rsim.exp b/dejagnu/boards/rtems-m32r-m32rsim.exp
deleted file mode 100755
index 4670610..0000000
--- a/dejagnu/boards/rtems-m32r-m32rsim.exp
+++ /dev/null
@@ -1,40 +0,0 @@
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {}
-
-# Load the generic configuration for this board, This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# The name of the simulator is "nosim"
-setup_sim nosim
-
-# No multilib flags needed by default.
-process_multilib_options ""
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler "[find_gcc]"
-
-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
-# We only have a small stack available to us
-set_board_info gcc,stack_size 2048
-
-# wrapper script which handles the device tree
-set_board_info sim "m32rsim"
-set_board_info sim,options "-i"
-
-# No support for signals on this target.
-set_board_info gdb,nosignals 1
-
-# The simulator doesn't return exit statuses and we need to indicate this.
-set_board_info needs_status_wrapper 1
-
-# Can't call functions from GDB.
-# set_board_info gdb,cannot_call_functions 1
diff --git a/gcc/RTEMS_GCC_Testing.txt b/gcc/RTEMS_GCC_Testing.txt
index df9e3f3..7dbf97b 100644
--- a/gcc/RTEMS_GCC_Testing.txt
+++ b/gcc/RTEMS_GCC_Testing.txt
@@ -133,7 +133,7 @@ this target
| i386-rtems* | pc386 | qemu
| lm32-rtems* | lm32_evr | gdb
| m32c-rtems* | m32csim | gdb
-| m32r-rtems* | m32rsim | gdb
+| m32r-rtems* | N/A | not supported
| m68k-rtems* | uC5282 | Qemu
| microblaze-rtems* | nosim | not executed
| mips-rtems* | jmr3904 | gdb
diff --git a/gcc/do_one b/gcc/do_one
index 173af02..08342fd 100755
--- a/gcc/do_one
+++ b/gcc/do_one
@@ -361,7 +361,6 @@ if [ ${needCPU} = yes -a ${needBSP} = yes -a \
i386-pc386|i386-qemu) dejacfg=rtems-i386-qemu ;;
lm32-lm32_evr) dejacfg=rtems-lm32-lm32_evr ;;
m32c-m32csim) dejacfg=rtems-m32c-m32csim ;;
- m32r-m32rsim) dejacfg=rtems-m32r-m32rsim ;;
m68k-uC5282) dejacfg=rtems-m68k-uC5282 ;;
microblaze-nosim) dejacfg=rtems-microblaze-nosim ;;
mips-jmr3904) dejacfg=rtems-mips-jmr3904 ;;
diff --git a/gcc/parallelize_build b/gcc/parallelize_build
index 3497bb2..9d5381c 100755
--- a/gcc/parallelize_build
+++ b/gcc/parallelize_build
@@ -185,7 +185,7 @@ ${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} h8300
${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} i386 pc386
${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} lm32 lm32_evr
${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} m32c m32csim
-${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} m32r m32rsim
+${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} m32r
${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} m68k uC5282
${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} mips jmr3904
${BASEDIR}/rtems-testing/gcc/do_one -B1 -A ${args} powerpc psim
diff --git a/gcc/rundeja b/gcc/rundeja
index cde46db..7821533 100755
--- a/gcc/rundeja
+++ b/gcc/rundeja
@@ -47,12 +47,6 @@ case $1 in
DEJABSP=m32csim
BSP_SIM=m32csim
;;
- m32rsim)
- CPU=m32r
- BSP=m32rsim
- DEJABSP=m32rsim
- BSP_SIM=m32rsim
- ;;
mcf5206elite)
CPU=m68k
BSP=mcf5206elite
diff --git a/gcc/test_driver b/gcc/test_driver
index f9f8202..fdf9678 100755
--- a/gcc/test_driver
+++ b/gcc/test_driver
@@ -264,7 +264,7 @@ build_cpu()
i386) bsp=pc386 ;;
lm32) bsp=lm32_evr ;;
m32c) bsp=m32csim ;;
- m32r) bsp=m32rsim ;;
+ m32r) bsp= ;;
m68k) bsp=uC5282 ;;
mips) bsp=jmr3904 ;;
powerpc) bsp=psim ;;
diff --git a/gcc/testsuite/ada/acats/Makefile.rtems b/gcc/testsuite/ada/acats/Makefile.rtems
index 4124b1b..7855c8a 100644
--- a/gcc/testsuite/ada/acats/Makefile.rtems
+++ b/gcc/testsuite/ada/acats/Makefile.rtems
@@ -42,9 +42,6 @@ stamp-targetrun:
ifeq ($(RTEMS_BSP),lm32_evr)
echo " qemu-lm32_evr -C -l 240 $$"'*' >> $@
endif # lm32_evr
- ifeq ($(RTEMS_BSP),m32rsim)
- echo " m32rsim -C -l 180 $$"'*' >> $@
- endif # m32rsim
ifeq ($(RTEMS_BSP),psim)
echo " psim -C -l 180 $$"'*' >> $@
endif # psim
diff --git a/rtems/bit_all_bsps b/rtems/bit_all_bsps
index 4ffdafd..081e106 100755
--- a/rtems/bit_all_bsps
+++ b/rtems/bit_all_bsps
@@ -134,7 +134,7 @@ get_bsps()
all_bsps="${all_bsps} ts_386ex" ;;
lm32) all_bsps="lm32_evr" ;;
m32c) all_bsps="m32csim" ;;
- m32r) all_bsps="m32rsim" ;;
+ m32r) all_bsps="" ;;
m68k) all_bsps="gen68360 gen68360_040 mvme147 mvme147s"
all_bsps="${all_bsps} mvme162 mvme162lx mvme167 ods68302"
all_bsps="${all_bsps} mcf5206elite "
diff --git a/sim-scripts/.gitignore b/sim-scripts/.gitignore
index 6e6da37..762a237 100644
--- a/sim-scripts/.gitignore
+++ b/sim-scripts/.gitignore
@@ -40,8 +40,6 @@ lm32_evr-gdb
lm3s6965
m32csim
m32csim-gdb
-m32rsim
-m32rsim-gdb
or1ksim
or1ksim-gdb
pc386
diff --git a/sim-scripts/Makefile b/sim-scripts/Makefile
index 2b63b70..3962edd 100644
--- a/sim-scripts/Makefile
+++ b/sim-scripts/Makefile
@@ -1,6 +1,6 @@
INSTALL_DIR=../bin
GDBSIM_SCRIPTS=bf537Stamp ezkit533 gdbarmsim jmr3904 lm32_evr \
- m32csim m32rsim or1ksim psim sis erc32 leon2 leon3 simsh v850sim
+ m32csim or1ksim psim sis erc32 leon2 leon3 simsh v850sim
SKYEYE_SCRIPTS=ant5206 bf537Stamp-skyeye csb337 csb350 csb360 edb7312 \
ezkit533-skyeye gumstix rtl22xx smdk2410 leon2-skyeye
@@ -127,9 +127,6 @@ lm32_evr lm32_evr-gdb: gdb-sim-run.in gdb-sim.in lm32_evr.in
m32csim m32csim-gdb: gdb-sim-run.in gdb-sim.in m32csim.in
./mkrun yes M32C m32c m32csim
-m32rsim m32rsim-gdb: gdb-sim-run.in gdb-sim.in m32rsim.in
- ./mkrun yes M32R m32r m32rsim
-
or1ksim or1ksim-gdb: or1ksim.in
./mkrun yes OR1K or1k or1ksim
diff --git a/sim-scripts/m32rsim.in b/sim-scripts/m32rsim.in
deleted file mode 100644
index fe2b7ce..0000000
--- a/sim-scripts/m32rsim.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# M32R/m32rsim Support
-#
-
-runARGS()
-{
- echo ${1}
-}
-checkBSPFaults()
-{
- return 0
-}
-
-bspLimit()
-{
- testname=$1
- case ${testname} in
- *stackchk*)limit=5 ;;
- *fatal*) limit=1 ;;
- *minimum*) limit=1 ;;
- *psxtime*) limit=180 ;;
- *) limit=60 ;;
- esac
- echo ${limit}
-}
--
2.1.4
This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This message contains confidential information and is intended only for the individual named. If you are not the named addressee you should not disseminate, distribute or copy this e-mail. Please notify the sender immediately by e-mail if you have received this e-mail by mistake and delete this e-mail from your system. If you are not the intended recipient you are notified that disclosing, copying, distributing or taking any action in reliance on the contents of this information is strictly prohibited.
More information about the devel
mailing list