<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems-testing (2011-08-20)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-08-21 Jie Liu <lj8175@gmail.com>
* gcc/rtems_gcj_init.c: New file for rtems/gcj testing.
* gcc/Makefile.rtems_gcjinit: The Makefile for
gcc/rtems_gcj_init.c
* gcc/rundeja: Add options for libjava test.
* gcc/test_driver: Add GCJ options.
* gcc/do_one: Add GCJ build and test options.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/ChangeLog.diff?r1=text&tr1=1.66&r2=text&tr2=1.67&diff_format=h">M</a></td><td width='1%'>1.67</td><td width='100%'>ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/gcc/Makefile.rtems_gcjinit?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">gcc/Makefile.rtems_gcjinit</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/gcc/do_one.diff?r1=text&tr1=1.24&r2=text&tr2=1.25&diff_format=h">M</a></td><td width='1%'>1.25</td><td width='100%'>gcc/do_one</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/gcc/rtems_gcj_init.c?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">gcc/rtems_gcj_init.c</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/gcc/rundeja.diff?r1=text&tr1=1.15&r2=text&tr2=1.16&diff_format=h">M</a></td><td width='1%'>1.16</td><td width='100%'>gcc/rundeja</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/gcc/test_driver.diff?r1=text&tr1=1.21&r2=text&tr2=1.22&diff_format=h">M</a></td><td width='1%'>1.22</td><td width='100%'>gcc/test_driver</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-testing/ChangeLog:1.66 rtems-testing/ChangeLog:1.67
--- rtems-testing/ChangeLog:1.66 Sun Mar 13 17:17:29 2011
+++ rtems-testing/ChangeLog Sat Aug 20 13:37:29 2011
</font><font color='#997700'>@@ -1,3 +1,12 @@
</font><font color='#000088'>+2011-08-21 Jie Liu <lj8175@gmail.com>
+
+ * gcc/rtems_gcj_init.c: New file for rtems/gcj testing.
+ * gcc/Makefile.rtems_gcjinit: The Makefile for
+ gcc/rtems_gcj_init.c
+ * gcc/rundeja: Add options for libjava test.
+ * gcc/test_driver: Add GCJ options.
+ * gcc/do_one: Add GCJ build and test options.
+
</font> 2011-03-13 Joel Sherrill <joel.sherrilL@OARcorp.com>
* README, VERSIONS: Specify rtems-testing not gcc-testing.
<font color='#006600'>diff -u /dev/null rtems-testing/gcc/Makefile.rtems_gcjinit:1.1
--- /dev/null Sat Aug 20 14:10:02 2011
+++ rtems-testing/gcc/Makefile.rtems_gcjinit Sat Aug 20 13:37:29 2011
</font><font color='#997700'>@@ -0,0 +1,17 @@
</font><font color='#000088'>+#
+# Makefile for GCJ testsuite
+#
+
+include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
+include $(RTEMS_CUSTOM)
+include $(PROJECT_ROOT)/make/leaf.cfg
+
+# Tool helpers
+
+all: rtems_gcj_init.o
+
+clean:
+ rm -f rtems_gcj_init.o
+
+rtems_gcj_init.o: ${SCRIPTDIR}/gcc/rtems_gcj_init.c
+ $(CC) $(CFLAGS) $(CPU_CFLAGS) -c ${SCRIPTDIR}/gcc/rtems_gcj_init.c
</font>
<font color='#006600'>diff -u rtems-testing/gcc/do_one:1.24 rtems-testing/gcc/do_one:1.25
--- rtems-testing/gcc/do_one:1.24 Mon Mar 14 09:39:47 2011
+++ rtems-testing/gcc/do_one Sat Aug 20 13:37:29 2011
</font><font color='#997700'>@@ -10,10 +10,12 @@
</font> # - building Objective-C (multilib) - 6m45.532s
# - building Ada (multilib) - ?
# - building Go (multilib) - ?
<font color='#000088'>+# - building GCJ (multilib) - ?
</font> # - Running GCC Test Suite (sis) - 122m47.289s
# - Running Objective-C Test Suite (sis) - ?
# - Running ACAT (sis) - ?
# - Running Go Test Suite (sis) - ?
<font color='#000088'>+# - Running GCJ Test Suite (sis) - ?
</font> #
# Computer Info
# Fedora 14 on Intel Core2 Duo Q6600 (4 core) @ 2.40GHz w/ 4GB RAM
<font color='#997700'>@@ -51,6 +53,9 @@
</font> # Build the GCC Go language cross compiler.
do_gccgo=no
do_gccgo_multilib=yes
<font color='#000088'>+# Build the GCC Java language cross compiler.
+do_gcj=no
+ do_gcj_multilib=yes
</font> # Build RTEMS for a particular CPU/BSP combination
do_rtems=no
# Which test suites do we attempt
<font color='#997700'>@@ -59,6 +64,7 @@
</font> run_acats=no
run_gccgotests=no
run_libgotests=no
<font color='#000088'>+run_libjavatests=no
</font> # Do we send email to gcc-testresults with the test results?
do_mail=yes
# Are we noisy when running?
<font color='#997700'>@@ -69,8 +75,8 @@
</font> {
cat <<EOF
do_one [options] CPU BSP
<font color='#880000'>- -A - binutils, stage 1, C++, C/C++ multilib, Ada, GCC Go, RTEMS
- -T - run GCC, Ada and GCC Go tests
</font><font color='#000088'>+ -A - binutils, stage 1, C++, C/C++ multilib, Ada, GCC Go, GCJ, RTEMS
+ -T - run GCC, Ada, GCC Go and GCJ tests
</font> -b - install binutils (from source or copy installed RPM contents)
-D - install gdb (from source or copy installed RPM contents)
-n - native compiler
<font color='#997700'>@@ -79,6 +85,7 @@
</font> -m - do not build multilib
-a - stage 2 Ada compiler
-G - stage 2 GCC Go compiler
<font color='#000088'>+ -J - stage 2 GCC Java compiler
</font> -r - build RTEMS
-g - run GCC C/C++ tests
-C - run ACATS
<font color='#997700'>@@ -89,6 +96,7 @@
</font> -P - Run Objective-C Tests
-o - run GCC Go tests
-t - run libgo tests
<font color='#000088'>+ -j - run libjava tests
</font> EOF
}
<font color='#997700'>@@ -117,6 +125,7 @@
</font> do_multilib="yes"
do_ada="yes"
do_gccgo="yes"
<font color='#000088'>+ do_gcj="yes"
</font> do_objc="yes"
do_rtems="yes"
;;
<font color='#997700'>@@ -138,6 +147,7 @@
</font> # Stage 2 arguments
a) do_ada=`toggle ${do_ada}` ;;
G) do_gccgo=`toggle ${do_gccgo}` ;;
<font color='#000088'>+ J) do_gcj=`toggle ${do_gcj}` ;;
</font> # Build RTEMS
r) do_rtems=`toggle ${do_rtems}` ;;
# Testsuites to run
<font color='#997700'>@@ -149,6 +159,7 @@
</font> P) run_objctests=`toggle ${do_objc}` ;;
o) run_gccgotests=`toggle ${run_gccgotests}` ;;
t) run_libgotests=`toggle ${run_libgotests}` ;;
<font color='#000088'>+ j) run_libjavatests=`toggle ${run_libjavatests}` ;;
</font> *) fatal ;;
esac
done
<font color='#997700'>@@ -196,32 +207,46 @@
</font> esac
fi
<font color='#000088'>+# Which CPUs do not support GCJ
+if [ ${do_gcj} = "yes" ] ; then
+ case ${cpu} in
+ avr|h8300|m32c)
+ do_gcj=no
+ echo ${cpu} does not support GCJ
+ ;;
+ *);;
+ esac
+fi
+
</font> # When verbose, print settings
if [ ${verbose} = yes ] ; then
<font color='#880000'>- echo "Target : " ${cpu}
- echo "BSP : " ${bsp}
- echo "Binutils : " ${do_binutils}
- echo "GDB : " ${do_gdb}
- echo "Build Native : " ${do_native}
- echo "Build Stage 1 : " ${do_stage1}
- echo " C++ : " ${do_cxx}
- echo " Multilib : " ${do_multilib}
- echo "Stage 2 : " ${do_ada}
- echo " Objective-C : " ${do_objc}
- echo " Ada : " ${do_ada}
- echo " Multilib : " ${do_ada_multilib}
- echo " GCC Go : " ${do_gccgo}
- echo " Multilib : " ${do_gccgo_multilib}
- echo "Build RTEMS : " ${do_rtems}
- echo "Run GCC Tests : " ${run_gcctests}
- echo "Run ObjC Tests: " ${run_objctests}
- echo "Run ACATS : " ${run_acats}
- echo "Run Go Tests : " ${run_gccgotests}
- echo "Do libgo Tests: " ${run_libgotests}
- echo "Email Tests : " ${do_mail}
- echo "Native GCC : " `type gcc`
- echo "PATH : " ${PATH}
- echo "Clean up : " ${do_cleanup}
</font><font color='#000088'>+ echo "Target : " ${cpu}
+ echo "BSP : " ${bsp}
+ echo "Binutils : " ${do_binutils}
+ echo "GDB : " ${do_gdb}
+ echo "Build Native : " ${do_native}
+ echo "Build Stage 1 : " ${do_stage1}
+ echo " C++ : " ${do_cxx}
+ echo " Multilib : " ${do_multilib}
+ echo "Stage 2 : " ${do_ada}
+ echo " Objective-C : " ${do_objc}
+ echo " Ada : " ${do_ada}
+ echo " Multilib : " ${do_ada_multilib}
+ echo " GCC Go : " ${do_gccgo}
+ echo " Go Multilib : " ${do_gccgo_multilib}
+ echo " GCJ : " ${do_gcj}
+ echo " GCJ Multilib : " ${do_gccgcj_multilib}
+ echo "Build RTEMS : " ${do_rtems}
+ echo "Run GCC Tests : " ${run_gcctests}
+ echo "Run ObjC Tests : " ${run_objctests}
+ echo "Run ACATS : " ${run_acats}
+ echo "Run Go Tests : " ${run_gccgotests}
+ echo "Do libgo Tests : " ${run_libgotests}
+ echo "Do libjava Tests: " ${run_libjavatests}
+ echo "Email Tests : " ${do_mail}
+ echo "Native GCC : " `type gcc`
+ echo "PATH : " ${PATH}
+ echo "Clean up : " ${do_cleanup}
</font> fi
# Should the user have specified a CPU and/or BSP?
<font color='#997700'>@@ -229,7 +254,8 @@
</font> needCPU=no
if [ ${do_binutils} = yes -o ${do_gdb} = yes -o \
<font color='#880000'>- ${do_stage1} = yes -o ${do_ada} = yes -o ${do_gccgo} = yes ] ; then
</font><font color='#000088'>+ ${do_stage1} = yes -o ${do_ada} = yes -o \
+ ${do_gccgo} = yes -o ${do_gcj} = yes ] ; then
</font> needCPU=yes
fi
<font color='#997700'>@@ -238,8 +264,14 @@
</font> do_cxx=yes
fi
<font color='#000088'>+if [ ${do_native} = yes -a ${do_gcj} = yes ] ; then
+ echo "Warning! GCJ requires native C++ to build."
+ do_cxx=yes
+fi
+
</font> if [ ${do_rtems} = yes -o ${run_gcctests} = yes -o \
<font color='#880000'>- ${run_acats} = yes -o ${run_gccgotests} = yes ] ; then
</font><font color='#000088'>+ ${run_acats} = yes -o ${run_gccgotests} = yes -o \
+ ${run_libjavatests} = yes ] ; then
</font> needBSP=yes
needCPU=yes
if [ x${bsp} = x ] ; then
<font color='#997700'>@@ -928,3 +960,85 @@
</font> test ${do_cleanup} = "yes" && rm -rf b-${cpu}-go
fi
exit 0
<font color='#000088'>+
+##### Build a GCJ compiler now that we have a cross installed
+j_gcj()
+{
+ if [ X${1} = X ] ; then
+ echo Usage: $0 TARGET_CPU
+ exit 1
+ fi
+ TARGET=${1}-rtems${RTEMS_VERSION}
+
+ if [ ! -d ${INSTALL} ] ; then
+ echo ${INSTALL} does not exist
+ exit 1
+ fi
+
+ if [ ${verbose} = yes ] ; then
+ echo "Cross GCC ==>" `type ${TARGET}-gcc`
+ fi
+
+ if [ ${do_gcj_multilib} = yes ] ; then
+ gcj_multilib="--enable-multilib"
+ else
+ gcj_multilib="--disable-multilib"
+ fi
+
+ case ${TARGET} in
+ i386*) GOFLAGS="-march=i486" ;;
+ *) GOFLAGS="" ;;
+ esac
+# CFLAGS_FOR_TARGET=-B${BSP_INSTALL}/${TARGET}/${BSP_BUILT}/lib/
+
+ ${GCCDIR}/configure \
+ ${GCC_EXTRA_ARGS} \
+ CFLAGS_FOR_TARGET="-B${BSP_INSTALL}/${TARGET}/${BSP_BUILT}/lib/ ${GOFLAGS}" \
+ --enable-threads=rtems --with-gnu-as ${gcj_multilib} \
+ --with-gnu-ld --disable-newlib --verbose \
+ --with-system-zlib --disable-nls \
+ --enable-version-specific-runtime-libs \
+ --with-host-libstdcxx=-static-libstdc++ \
+ --enable-languages=c,c++,java --target=$TARGET --prefix=$INSTALL &&
+ make ${MAKEJOBS} &&
+ make install
+ status=$?
+ if [ $status -ne 0 ] ; then
+ echo "Failed building GCJ"
+ fi
+ exit $status
+}
+
+gcj_fail="no"
+if [ ${do_gcj} = "yes" ] ; then<span style="background-color: #FF0000"> </span>
+ echo "Building Stage 2 cross GCC Java compiler for ${1} ..."
+ (cd ${BASEDIR} && \
+ rm -rf b-${cpu}-gcj && \
+ mkdir b-${cpu}-gcj && \
+ cd b-${cpu}-gcj && \
+ time j_gcj ${cpu} >${LOGDIR}/${cpu}-gcj.log 2>&1 && cd ..) || \
+ gcj_fail="yes"
+else
+ echo Skipping GCC Java compiler for ${cpu}
+fi
+
+##### Do the libjava tests
+if [ $a ${run_libjavatests} = "yes" -a \
+ -d ${BASEDIR}/b-${cpu}-gcj -a ${gcj_fail} = "no" ] ; then
+ echo "Running libjava DejaGNU tests..."
+ cd ${BASEDIR}/b-${cpu}-gcj || exit 1
+ time sh -x ${SCRIPTDIR}/gcc/rundeja ${bsp} libjava \
+ >${LOGDIR}/${cpu}-libjavatests-${bsp}.log 2>&1
+
+ RDIR=${RESULTSDIR}/${TARGET}-${bsp}/`date +%Y-%m-%d-%H-%M-%S`
+ mkdir -p ${RDIR}
+ cp ${TARGET}-${bsp}/libjava/testsuite/libjava-all.log \
+ ${TARGET}-${bsp}/libjava/testsuite/libjava-all.sum ${RDIR}
+else
+ echo Skipping libjava DejaGNU tests for ${cpu}/${bsp}
+fi
+
+if [ ${do_gcj} = "yes" ] ; then<span style="background-color: #FF0000"> </span>
+ test ${do_cleanup} = "yes" && rm -rf b-${cpu}-gcj
+fi
+exit 0
</font>
<font color='#006600'>diff -u /dev/null rtems-testing/gcc/rtems_gcj_init.c:1.1
--- /dev/null Sat Aug 20 14:10:02 2011
+++ rtems-testing/gcc/rtems_gcj_init.c Sat Aug 20 13:37:29 2011
</font><font color='#997700'>@@ -0,0 +1,85 @@
</font><font color='#000088'>+#include <bsp.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <uart.h> //gdb
+#if defined(__mips__)
+/* GCC sometimes expects this on the mips */
+void _flush_cache()
+{
+}
+#endif
+static int argc = 1;
+static char arg0[20] = "rtems";
+static char *argv[20] = { arg0 };
+extern int main( int, char ** );
+extern int BSPConsolePort; //gdb
+int remote_debug=1;//gdb
+
+void *POSIX_Init(void*);
+
+/* configuration information */
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MICROSECONDS_PER_TICK 1000
+#define CONFIGURE_TICKS_PER_TIMESLICE 50
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 50
+#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 100
+#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 100
+#define CONFIGURE_MAXIMUM_POSIX_KEYS 300
+#define CONFIGURE_MAXIMUM_POSIX_TIMERS 100
+#define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 100
+#define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES 100
+#define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 100
+#define CONFIGURE_MAXIMUM_TASK_VARIABLES (2 * 40)
+#define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE (4*1024 * 1024)
+#define CONFIGURE_MINIMUM_TASK_STACK_SIZE (1*1024 * 1024)
+
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
+
+#define CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY TRUE
+//#define CONFIGURE_UNIFIED_WORK_AREAS --should care !!!
+#define CONFIGURE_STACK_CHECKER_ENABLED TRUE
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+void *POSIX_Init(
+ void *argument
+)
+{
+ struct sched_param param;
+ param.sched_priority = 5;
+ pthread_setschedparam(pthread_self(),SCHED_OTHER, ¶m);
+ //printf("Switch to GCJ Java HelloWorld!----in rtems_init.c\n");
+ /*gdb 1-----------------
+ if(BSPConsolePort!=BSP_UART_COM2)
+ i386_stub_glue_init(BSP_UART_COM2);
+ else
+ i386_stub_glue_init(BSP_UART_COM1);
+ set_debug_traps();
+ i386_stub_glue_init_breakin();
+ breakpoint();
+ //gdb -----------------*/
+ /*gdb 2---------------
+ init_remote_gdb();
+ breakpoint();
+ //gdb 2--------------*/
+ /*RTEMS memory view----
+ printf( "RTEMS Work Space : 0x%X -- 0x%X (%dM)\n",
+ Configuration.work_space_start,
+ (char*)Configuration.work_space_start + Configuration.work_space_size,
+ Configuration.work_space_size/1024/1024
+ );
+ printf( "RTEMS Malloc Heap : 0x%X -- 0x%X (%dM)\n",
+ RTEMS_Malloc_Heap->area_begin,
+ RTEMS_Malloc_Heap->area_end,
+ (RTEMS_Malloc_Heap->area_end - RTEMS_Malloc_Heap->area_begin)/1024/1024
+ );
+ //memory view ----------*/
+ main(argc, argv);
+ exit(0);
+}
</font>
<font color='#006600'>diff -u rtems-testing/gcc/rundeja:1.15 rtems-testing/gcc/rundeja:1.16
--- rtems-testing/gcc/rundeja:1.15 Mon Mar 14 09:39:47 2011
+++ rtems-testing/gcc/rundeja Sat Aug 20 13:37:29 2011
</font><font color='#997700'>@@ -146,6 +146,22 @@
</font> --target_board=rtems-${CPU}-${DEJABSP} \
"
;;
<font color='#000088'>+ libjava)
+ RTEMS_MAKEFILE_PATH=${rtemsdir} \
+ SCRIPTDIR=${SCRIPTDIR} \
+ make -f ${SCRIPTDIR}/gcc/Makefile.rtems_gcjinit
+ if [ $? -ne 0 ] ; then
+ echo unable to compile RTEMS GCC Java Init File
+ exit 1
+ fi
+ rtems_config=`pwd`/rtems_gcj_init.o
+ make check-gcc-java RUNTESTFLAGS="\
+ SIM=${BSP_SIM} \
+ RTEMS_MAKEFILE_PATH=${rtemsdir} \
+ RTEMS_CONFIG_OBJ=${rtems_config} \
+ --target_board=rtems-${CPU}-${DEJABSP} \
+ "
+ ;;
</font> gcc)
RTEMS_MAKEFILE_PATH=${rtemsdir} \
SCRIPTDIR=${SCRIPTDIR} \
<font color='#006600'>diff -u rtems-testing/gcc/test_driver:1.21 rtems-testing/gcc/test_driver:1.22
--- rtems-testing/gcc/test_driver:1.21 Mon Mar 14 09:39:47 2011
+++ rtems-testing/gcc/test_driver Sat Aug 20 13:37:29 2011
</font><font color='#997700'>@@ -53,6 +53,7 @@
</font> -1 - build basic tools (default=yes)
-a - build Ada (default=yes)
-G - build GCC Go (default=yes)
<font color='#000088'>+ -J - build GCJ (default=yes)
</font> -c - clean install point (also installs auto tools)
-m - mail results to lists (default=yes)
-n - build native
<font color='#997700'>@@ -71,6 +72,7 @@
</font> verbose="no"
doAda="yes"
doGccGo="yes"
<font color='#000088'>+doGcj="yes"
</font> doMail="yes"
doTests="yes"
justTests="no"
<font color='#997700'>@@ -86,6 +88,7 @@
</font> 1) doBasicTools=`toggle ${doBasicTools}` ;;
a) doAda=`toggle ${doAda}` ;;
G) doGccGo=`toggle ${doGccGo}` ;;
<font color='#000088'>+ J) doGcj=`toggle ${doGcj}` ;;
</font> c) doCleanInstallPoint=`toggle ${doCleanInstallPoint}` ;;
j) justTests=`toggle ${justTests}` ;;
m) doMail=`toggle ${doMail}` ;;
<font color='#997700'>@@ -135,6 +138,7 @@
</font> echo "Build Basic Tools: " ${doBasicTools}
echo "Build Ada: " ${doAda}
echo "Build GCC Go: " ${doGccGo}
<font color='#000088'>+ echo "Build GCJ: " ${doGcj}
</font> echo "Email Results: " ${doMail}
echo "Run Tests: " ${doTests}
echo "CPUs to Build: " ${CPUs}
<font color='#997700'>@@ -144,12 +148,14 @@
</font> test ${doTests} = "yes" && testArg="-T"
test ${doAda} = "yes" && adaArg="-a"
test ${doGccGo} = "yes" && gccgoArg="-G"
<font color='#000088'>+test ${doGcj} = "yes" && gcjArg="-J"
</font> test ${doBasicTools} = "yes" && basicArgs="-b -D -1 -r"
echo "Checking for just tests override"
if [ ${justTests} = "yes" ] ; then
adaArg=""
gccgoArg=""
<font color='#000088'>+ gcjArg=""
</font> basicArgs=""
fi
<font color='#997700'>@@ -265,10 +271,10 @@
</font> doOne=${SCRIPTDIR}/gcc/do_one<span style="background-color: #FF0000"> </span>
echo "Building ${cpu}/${bsp}..."<span style="background-color: #FF0000"> </span>
echo "time sh -x ${doOne} -v -d ${basicArgs} \
<font color='#880000'>- ${gccgoArg} ${adaArg} ${mailArg} ${testArg} \
</font><font color='#000088'>+ ${gccgoArg} ${gcjArg} ${adaArg} ${mailArg} ${testArg} \
</font> ${cpu} ${bsp} >${BASEDIR}/${bsp}.log 2>&1"
time sh -x ${doOne} -v -d ${basicArgs} \
<font color='#880000'>- ${gccgoArg} ${adaArg} ${mailArg} ${testArg} \
</font><font color='#000088'>+ ${gccgoArg} ${gcjArg} ${adaArg} ${mailArg} ${testArg} \
</font> ${cpu} ${bsp} >${BASEDIR}/${bsp}.log 2>&1
echo $?
done
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>