From 5fd483f071c5fdcf3a3258b5e8f6c6db1df62bc3 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 28 Jan 2011 15:59:18 +0000 Subject: 2011-01-28 Joel Sherrill * do_one, test_driver, testsuite/ada/acats/Makefile.rtems: Various improvements as part of testing gcc 4.6.0. --- gcc/ChangeLog | 5 +++ gcc/do_one | 53 +++++++++++++++++++------ gcc/test_driver | 72 ++++++++++++++++++++-------------- gcc/testsuite/ada/acats/Makefile.rtems | 5 ++- 4 files changed, 91 insertions(+), 44 deletions(-) (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b1effd4..2b5dfed 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-01-28 Joel Sherrill + + * do_one, test_driver, testsuite/ada/acats/Makefile.rtems: Various + improvements as part of testing gcc 4.6.0. + 2011-01-24 Joel Sherrill * do_one: Fix script. diff --git a/gcc/do_one b/gcc/do_one index 33cdc31..b6a31e5 100755 --- a/gcc/do_one +++ b/gcc/do_one @@ -148,16 +148,41 @@ shift $shiftcount cpu=${1} bsp=${2} -case ${cpu} in - m32c) - do_ada=no - do_cxx=no - run_acats=no - echo M32C does not support C++ or Ada - ;; - *);; -esac +# Which CPUs do not support C++ +if [ ${do_cxx} = "yes" ] ; then + case ${cpu} in + avr|h8300|m32c) + do_cxx=no + echo ${cpu} does not support C++ + ;; + *);; + esac +fi + +# Which CPUs do not support Ada +if [ ${do_ada} = "yes" ] ; then + case ${cpu} in + avr|h8300|m32c) + do_ada=no + run_acats=no + echo ${cpu} does not support Ada + ;; + *);; + esac +fi + +# Which CPUs do not support Go +if [ ${do_gccgo} = "yes" ] ; then + case ${cpu} in + avr|h8300|m32c) + do_gccgo=no + echo ${cpu} does not support Go + ;; + *);; + esac +fi +# When verbose, print settings if [ ${verbose} = yes ] ; then echo "Target : " ${cpu} echo "BSP : " ${bsp} @@ -219,6 +244,7 @@ fi TARGET=${cpu}-rtems${RTEMS_VERSION} +# Do we accept an alternate name for the BSP? if [ x${bsp} = xqemu ] ; then BSP_BUILT=pc386 else @@ -415,6 +441,7 @@ j_native() test ${do_native_ada} = "yes" && AdaArg=",ada" ${GCCDIR}/configure \ ${NATIVE_GCC_EXTRA_ARGS} \ + --disable-werror \ --enable-languages=c,c++${AdaArg} --prefix=$INSTALL && make ${MAKEJOBS} && make install } @@ -465,6 +492,7 @@ j_gcc1() ${GCCDIR}/configure \ ${GCC_EXTRA_ARGS} \ + --disable-werror \ --enable-threads=rtems --with-gnu-as ${multilib} \ --enable-newlib-mb --enable-newlib-iconv \ --with-gnu-ld --with-newlib --verbose --with-system-zlib --disable-nls \ @@ -614,8 +642,7 @@ j_gccada() ${GCCDIR}/configure \ ${GCC_EXTRA_ARGS} \ --enable-threads=rtems --with-gnu-as ${ada_multilib} \ - --enable-newlib-mb --enable-newlib-iconv \ - --with-gnu-ld --with-newlib --verbose --with-system-zlib --disable-nls \ + --with-gnu-ld --disable-newlib --verbose --with-system-zlib --disable-nls \ CFLAGS_FOR_TARGET=-B${BSP_INSTALL}/${TARGET}/${BSP_BUILT}/lib/ \ --enable-version-specific-runtime-libs \ --enable-languages=c,ada --target=$TARGET --prefix=$INSTALL && @@ -699,8 +726,8 @@ set -x ${GCC_EXTRA_ARGS} \ CFLAGS_FOR_TARGET="-B${BSP_INSTALL}/${TARGET}/${BSP_BUILT}/lib/ ${GOFLAGS}" \ --enable-threads=rtems --with-gnu-as ${gccgo_multilib} \ - --enable-newlib-mb --enable-newlib-iconv \ - --with-gnu-ld --with-newlib --verbose --with-system-zlib --disable-nls \ + --with-gnu-ld --disable-newlib --verbose \ + --with-system-zlib --disable-nls \ --enable-version-specific-runtime-libs \ --with-host-libstdcxx=-static-libstdc++ \ --enable-languages=c,go --target=$TARGET --prefix=$INSTALL && diff --git a/gcc/test_driver b/gcc/test_driver index 5f0f48d..be10a59 100755 --- a/gcc/test_driver +++ b/gcc/test_driver @@ -29,6 +29,13 @@ do fi done +if [ x${PPL} != x ] ; then + if [ ! -d ${PPL} ] ; then + echo "Cannot locate ${d} -- aborting" + exit 1 + fi +fi + toggle() { case $1 in @@ -101,6 +108,17 @@ do fi done +CPUS_PART1="arm h8300 i386 m32c mips sh sparc64" +CPUS_PART2="bfin lm32 m32r m68k powerpc sparc avr" +ALL_CPUs="${CPUS_PART1} ${CPUS_PART2}" + +if [ "X${CPUs}" = "X" ] ; then + CPUs="${ALL_CPUs}" +elif [ "X${CPUs}" = "X part1" ] ; then + CPUs="${CPUS_PART1}" +elif [ "X${CPUs}" = "X part2" ] ; then + CPUs="${CPUS_PART2}" +fi if [ ${verbose} = "yes" ] ; then echo "Clean Install Point: " ${doCleanInstallPoint} @@ -112,11 +130,7 @@ if [ ${verbose} = "yes" ] ; then echo "Build GCC Go: " ${doGccGo} echo "Email Results: " ${doMail} echo "Run Tests: " ${doTests} - if [ "X${CPUs}" = "X" ] ; then - echo "CPUs to Build: " ALL - else - echo "CPUs to Build: " ${CPUs} - fi + echo "CPUs to Build: " ${CPUs} fi test ${doMail} = "no" && mailArg="-M" @@ -175,6 +189,19 @@ install_auto() done } +install_ppl() +{ + if [ x${PPL} != x ] ; then + if [ -r ${INSTALL}/lib/libppl.a ] ; then + echo "*** Building PPL ***" + cd ${PPL} + make distclean + ./configure --prefix=${INSTALL} + make all install + fi + fi +} + # This handles GNU tools from CVS update_others() { @@ -221,7 +248,9 @@ do_cpus() esac doOne=${SCRIPTDIR}/gcc/do_one - time sh -x ${doOne} -v -b -D -1 -d -r ${gccgoArg} ${adaArg} ${mailArg} ${testArg} \ + echo "Building ${cpu}/${bsp}..." + time sh -x ${doOne} -v -b -D -1 -d -r \ + ${gccgoArg} ${adaArg} ${mailArg} ${testArg} \ ${cpu} ${bsp} >${BASEDIR}/${bsp}.log 2>&1 echo $? done @@ -231,8 +260,6 @@ do_cpus() echo Stopped at: ${stopped} } -update_gcc - if [ ${doCleanInstallPoint} = "yes" ] ; then # Clean the install point clean_up @@ -246,6 +273,9 @@ fi update_gcc update_others fi + if [ ! -r ${INSTALL}/lib/libppl.a ] ; then + install_ppl + fi wait # Do any remaining prep work in parallel @@ -261,28 +291,10 @@ fi # Now cycle over all these CPUs if [ $? -eq 0 ] ; then - if [ $# -eq 0 ] ; then - # Requires Skyeye install - do_cpus arm - - # no simulator -- waiting for Skyeye - do_cpus bfin - - # Simulators included in gdb - do_cpus h8300 lm32 m32c m32r mips powerpc sh sparc sparc64 - - # Requires qemu installation - do_cpus i386 m68k - - # port insufficient to run gcc tests - do_cpus avr - else - for cpu in ${CPUs} - do - do_cpus ${cpu} - done - fi - + for cpu in ${CPUs} + do + do_cpus ${cpu} + done fi stopped=`date` diff --git a/gcc/testsuite/ada/acats/Makefile.rtems b/gcc/testsuite/ada/acats/Makefile.rtems index bf49f54..8f199b2 100644 --- a/gcc/testsuite/ada/acats/Makefile.rtems +++ b/gcc/testsuite/ada/acats/Makefile.rtems @@ -12,6 +12,7 @@ include $(PROJECT_ROOT)/make/leaf.cfg rtemsdir=${RTEMS_MAKEFILE_PATH} GNATMAKE=$(AS:as=gnatmake) GNATCHOP=$(AS:as=gnatchop) +OBJCOPY=$(AS:as=objcopy) CARGS = -B${rtemsdir}/lib/ -specs bsp_specs -qrtems CARGS += $(LDFLAGS) $(AM_LDFLAGS) # RTS= --RTS=$(shell $(CC) -print-multi-directory $(CFLAGS)) @@ -64,7 +65,9 @@ stamp-targetrun: echo " qemuppc -C -l 90 $$"'*' >> $@ endif # qemuppc ifeq ($(RTEMS_BSP),uC5282) - echo " uC5282 -C -l 90 $$"'*' >> $@ + echo " $(OBJCOPY) -O binary $$"'*' "$$"'*'.ralf >>$@ + echo " uC5282 -C -l 90 $$"'*'.ralf >> $@ + echo " rm -f "$$'*'.ralf >>$@ endif # uC5282 ifeq ($(RTEMS_BSP),mcf5206elite) echo " nosim $$"'*' >> $@ -- cgit v1.2.3