summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-02-07 19:56:00 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-02-07 19:56:00 +0000
commitb68e057ebe654b575ffc2e81bc30432f9aee19de (patch)
treede3212e4e0fff6857f1583f1612dcb5171012db3
parente496c1f1edbf5ba14223bfb6dc566e4a6f4f5c3f (diff)
downloadrtems-b68e057ebe654b575ffc2e81bc30432f9aee19de.tar.bz2
Fixed to correctly operate on target variants like debug and profile.
-rw-r--r--c/src/exec/score/tools/generic/size_rtems.in32
-rw-r--r--c/src/exec/wrapup/rtems/Makefile.in13
-rw-r--r--tools/cpu/generic/size_rtems.in32
3 files changed, 56 insertions, 21 deletions
diff --git a/c/src/exec/score/tools/generic/size_rtems.in b/c/src/exec/score/tools/generic/size_rtems.in
index 15d14d433e..8d61ff080a 100644
--- a/c/src/exec/score/tools/generic/size_rtems.in
+++ b/c/src/exec/score/tools/generic/size_rtems.in
@@ -29,26 +29,30 @@ program_prefix=@program_prefix@
gnusize=${program_prefix}size
# check usage
-if [ $# -ne 1 ] ; then
- echo usage ${0}: bsp
+if [ $# -ne 2 ] ; then
+ echo usage ${0}: bsp object_directory
exit 1
fi
bsp=$1
board=$1
+ARCH=$2
cpu=`echo $target | sed -e 's/-.*//'`
-echo $target
case $target in
sparc-sun-solaris*)
rtems_cpu=unix
bsp=solaris2
+ echo Not supported on unix port.
+ exit 0
;;
i[3456]86-pc-linux-gnu)
echo linux
rtems_cpu=unix
bsp=linux1
+ echo Not supported on unix port.
+ exit 0
;;
*-rtems*)
cpu=`echo $target | sed -e 's/-.*//'`
@@ -64,10 +68,20 @@ case $target in
;;
esac
+case $ARCH in
+ *debug*) VARIANT=debug ;;
+ *profile*) VARIANT=profile ;;
+ *) VARIANT=optimized;;
+esac
+
echo
-echo Generating sizes for CPU ${cpu} on board ${board}
+echo Size Information for the Following Configuration:
+echo CPU: ${cpu}
+echo BSP: ${board}
+echo VARIANT: ${VARIANT}
echo
+
#
# KLUDGE to figure out at runtime how to echo a line without a
# newline.
@@ -87,11 +101,11 @@ if [ ! -d ${board} ] ; then
fi
#DIRLIST -- so greps for DIRLIST will find this file
-CPUOBJ=c/src/exec/score/cpu/${rtems_cpu}/o-${bsp}
-COREOBJ=c/src/exec/score/src/o-${bsp}
-RTEMSOBJ=c/src/exec/rtems/src/o-${bsp}
-SAPIOBJ=c/src/exec/sapi/src/o-${bsp}
-OPTOBJ=${board}/lib
+CPUOBJ=c/src/exec/score/cpu/${rtems_cpu}/${ARCH}
+COREOBJ=c/src/exec/score/src/${ARCH}
+RTEMSOBJ=c/src/exec/rtems/src/${ARCH}
+SAPIOBJ=c/src/exec/sapi/src/${ARCH}
+OPTOBJ=c/src/exec/rtems/optman/${ARCH}
MANLIST=" \
${RTEMSOBJ}/clock.o \
diff --git a/c/src/exec/wrapup/rtems/Makefile.in b/c/src/exec/wrapup/rtems/Makefile.in
index e0382e4fd5..b654e51f13 100644
--- a/c/src/exec/wrapup/rtems/Makefile.in
+++ b/c/src/exec/wrapup/rtems/Makefile.in
@@ -41,11 +41,18 @@ LDFLAGS +=
CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS +=
+EXTENSION_SUFFIX_$(TARGET_ARCH)_V=
+EXTENSION_SUFFIX_$(TARGET_ARCH)-debug_V=_debug
+EXTENSION_SUFFIX_$(TARGET_ARCH)-profile_V=_profile
+
+EXTENSION_VARIANT=$(EXTENSION_SUFFIX_$(ARCH)_V)
+
+
$(LIB): ${OBJS}
$(make-library)
- -cd $(PROJECT_ROOT) ; \
- $(PROJECT_RELEASE)/bin/size_rtems $(RTEMS_BSP) \
- >$(PROJECT_RELEASE)/lib/sizeinfo.txt
+ cd $(PROJECT_ROOT) ; \
+ $(PROJECT_RELEASE)/bin/size_rtems $(RTEMS_BSP) $(ARCH) \
+ >$(PROJECT_RELEASE)/lib/sizeinfo$(EXTENSION_VARIANT).txt
all: ${ARCH} $(SRCS) $(LIB)
$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib
diff --git a/tools/cpu/generic/size_rtems.in b/tools/cpu/generic/size_rtems.in
index 15d14d433e..8d61ff080a 100644
--- a/tools/cpu/generic/size_rtems.in
+++ b/tools/cpu/generic/size_rtems.in
@@ -29,26 +29,30 @@ program_prefix=@program_prefix@
gnusize=${program_prefix}size
# check usage
-if [ $# -ne 1 ] ; then
- echo usage ${0}: bsp
+if [ $# -ne 2 ] ; then
+ echo usage ${0}: bsp object_directory
exit 1
fi
bsp=$1
board=$1
+ARCH=$2
cpu=`echo $target | sed -e 's/-.*//'`
-echo $target
case $target in
sparc-sun-solaris*)
rtems_cpu=unix
bsp=solaris2
+ echo Not supported on unix port.
+ exit 0
;;
i[3456]86-pc-linux-gnu)
echo linux
rtems_cpu=unix
bsp=linux1
+ echo Not supported on unix port.
+ exit 0
;;
*-rtems*)
cpu=`echo $target | sed -e 's/-.*//'`
@@ -64,10 +68,20 @@ case $target in
;;
esac
+case $ARCH in
+ *debug*) VARIANT=debug ;;
+ *profile*) VARIANT=profile ;;
+ *) VARIANT=optimized;;
+esac
+
echo
-echo Generating sizes for CPU ${cpu} on board ${board}
+echo Size Information for the Following Configuration:
+echo CPU: ${cpu}
+echo BSP: ${board}
+echo VARIANT: ${VARIANT}
echo
+
#
# KLUDGE to figure out at runtime how to echo a line without a
# newline.
@@ -87,11 +101,11 @@ if [ ! -d ${board} ] ; then
fi
#DIRLIST -- so greps for DIRLIST will find this file
-CPUOBJ=c/src/exec/score/cpu/${rtems_cpu}/o-${bsp}
-COREOBJ=c/src/exec/score/src/o-${bsp}
-RTEMSOBJ=c/src/exec/rtems/src/o-${bsp}
-SAPIOBJ=c/src/exec/sapi/src/o-${bsp}
-OPTOBJ=${board}/lib
+CPUOBJ=c/src/exec/score/cpu/${rtems_cpu}/${ARCH}
+COREOBJ=c/src/exec/score/src/${ARCH}
+RTEMSOBJ=c/src/exec/rtems/src/${ARCH}
+SAPIOBJ=c/src/exec/sapi/src/${ARCH}
+OPTOBJ=c/src/exec/rtems/optman/${ARCH}
MANLIST=" \
${RTEMSOBJ}/clock.o \