summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--VERSIONS9
-rwxr-xr-xdo_one12
-rwxr-xr-xtest_driver2
4 files changed, 22 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c1c765..ba15ec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-07 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * VERSIONS: Set parallelism based upon machine name.
+ * do_one: Use MAKEJOBS variable.
+ * test_driver: use function not external script.
+
2009-01-06 Joel Sherrill <joel.sherrill@oarcorp.com>
* README: Add information on host requirements.
diff --git a/VERSIONS b/VERSIONS
index b4cde6a..9bbf55a 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -27,6 +27,15 @@ case `hostname` in
;;
esac
+case `hostname` in
+ RTBF32|RTBF64)
+ MAKEJOBS="-j6"
+ ;;
+ *)
+ MAKEJOBS="-j3"
+ ;;
+esac
+
INSTALL=${BASEDIR}/install
BSP_INSTALL=${BASEDIR}/bsp-install
SCRIPTDIR=${BASEDIR}/gcc-testing
diff --git a/do_one b/do_one
index ab34e59..5358c1d 100755
--- a/do_one
+++ b/do_one
@@ -277,7 +277,7 @@ j_binutils()
mkdir b-binutils-${cpu}
cd b-binutils-${cpu}
(${BINUTILSDIR}/configure --target=${TARGET} --prefix=$INSTALL && \
- make -j3 && make install) >${LOGDIR}/${cpu}-binutils.log 2>&1
+ make ${MAKEJOBS} && make install) >${LOGDIR}/${cpu}-binutils.log 2>&1
if [ $? -ne 0 ] ; then
echo "Failed to build Binutils from source"
exit 1
@@ -340,7 +340,7 @@ j_gdb()
(${GDBDIR}/configure --target=${GDBTARGET} \
--enable-sim --enable-sim-hardware \
--enable-timebase --enable-sim-trace --prefix=$INSTALL && \
- make -j3 && make install) >${LOGDIR}/${cpu}-gdb.log 2>&1
+ make ${MAKEJOBS} && make install) >${LOGDIR}/${cpu}-gdb.log 2>&1
if [ $? -ne 0 ] ; then
echo "Failed to build gdb from source"
exit 1
@@ -367,7 +367,7 @@ j_native()
${GCCDIR}/configure \
${NATIVE_GCC_EXTRA_ARGS} \
--enable-languages=c${AdaArg} --prefix=$INSTALL &&
- make -j3 && make install
+ make ${MAKEJOBS} && make install
}
if [ ${do_native} = "yes" ] ; then
@@ -421,7 +421,7 @@ j_gcc1()
--with-gnu-ld --with-newlib --verbose --with-system-zlib --disable-nls \
--enable-version-specific-runtime-libs \
--enable-languages=c${cxx} --target=$TARGET --prefix=$INSTALL &&
- make -j3 &&
+ make ${MAKEJOBS} &&
make install
}
@@ -468,7 +468,7 @@ j_rtems()
esac
${RTEMSDIR}/configure --target=${TARGET} ${ENABLE_BSP} \
${RTEMS_ARGS} --enable-maintainer-mode --disable-tests \
- --prefix=${BSP_INSTALL} && make -j3 && make install
+ --prefix=${BSP_INSTALL} && make ${MAKEJOBS} && make install
cd ..
}
@@ -553,7 +553,7 @@ j_gcc2()
CFLAGS_FOR_TARGET=-B${BSP_INSTALL}/${TARGET}/${bsp}/lib/ \
--enable-version-specific-runtime-libs \
--enable-languages=c,ada --target=$TARGET --prefix=$INSTALL &&
- make -j3 &&
+ make ${MAKEJOBS} &&
make install
}
diff --git a/test_driver b/test_driver
index 2dcf77e..87be080 100755
--- a/test_driver
+++ b/test_driver
@@ -139,7 +139,7 @@ time sh -x ${SCRIPTDIR}/do_one -n >native.log 2>&1
# Now cycle over all these CPUs
if [ $? -eq 0 ] ; then
- ${SCRIPTDIR}/do_cpus powerpc sparc
+ do_cpus powerpc sh sparc
#${SCRIPTDIR}/do_cpus m32c arm h8300 i386 mips sh powerpc sparc
#${SCRIPTDIR}/do_cpus i386
# wait