diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | VERSIONS | 23 | ||||
| -rwxr-xr-x | do_cpus | 13 | ||||
| -rwxr-xr-x | do_one | 6 |
4 files changed, 35 insertions, 11 deletions
@@ -1,3 +1,7 @@ +2008-12-16 Joel Sherrill <joel.sherrill@oarcorp.com> + + * VERSIONS, do_cpus, do_one: Update script. + 2008-12-10 Joel Sherrill <joel.sherrill@oarcorp.com> * gcc/testsuite/ada/acats/Makefile.rtems: Invoke simsh correctly. @@ -4,15 +4,28 @@ BASEDIR=/home/joel/work-gnat/svn/ RTEMS_VERSION=4.10 AUTOCONF=${BASEDIR}/autoconf-2.62 -AUTOMAKE=${BASEDIR}/automake-1.10.1 -GCCDIR=${BASEDIR}/gcc +AUTOMAKE=${BASEDIR}/automake-1.10.2 +GCCDIR=${BASEDIR}/gcc-svn BINUTILSDIR=${BASEDIR}/binutils-cvs/src +NEWLIBDIR=${BASEDIR}/newlib-cvs/ GDBDIR=${BASEDIR}/gdb-cvs/src RTEMSDIR=${BASEDIR}/rtems -# Needed on GCC CFARM -# NATIVE_GCC_EXTRA_ARGS="--with-mpfr=/opt/cfarm/mpfr-2.3.1/" -# GCC_EXTRA_ARGS="--with-mpfr=/opt/cfarm/mpfr-2.3.1/" +# These things vary between the GCC CFARM and OAR test machines +case `hostname` in + gcc*) + NATIVE_GCC_EXTRA_ARGS="--with-mpfr=/opt/cfarm/mpfr-2.3.1/" + GCC_EXTRA_ARGS="--with-mpfr=/opt/cfarm/mpfr-2.3.1/" + ;; + iceland*|*oarcorp*) + NATIVE_GCC_EXTRA_ARGS="" + GCC_EXTRA_ARGS="" + ;; + *) + echo "UNKNOWN HOST!!!" + exit 1 + ;; +esac INSTALL=${BASEDIR}/install BSP_INSTALL=${BASEDIR}/bsp-install @@ -21,17 +21,18 @@ for cpu in $* do case $cpu in native) bsp=native ;; - sparc) bsp=sis ;; - powerpc) bsp=psim ;; + arm) bsp=edb7312 ;; + avr) bsp=avrtest ;; + bfin) bsp=eZKit533 ;; + h8300) bsp=h8sim ;; i386) bsp=pc386 ;; m32c) bsp=m32csim ;; m32r) bsp=m32rsim ;; + m68k) bsp=mcf5206elite ;; mips) bsp=jmr3904 ;; - bfin) bsp=eZKit533 ;; - h8300) bsp=h8sim ;; + powerpc) bsp=psim ;; sh) bsp=simsh1 ;; - arm) bsp=edb7312 ;; - m68k) bsp=mcf5206elite ;; + sparc) bsp=sis ;; *) echo "Unknown CPU ${cpu}" exit 1 @@ -212,11 +212,13 @@ if [ ${needCPU} = yes -a ${needBSP} = yes ] ; then case ${cpu}-${bsp} in arm-edb7312) dejacfg=rtems-arm-edb7312 ;; + avr-avrtest) dejacfg=rtems-avr-avrtest ;; bfin-eZKit533) dejacfg=rtems-bfin-nosim ;; h8300-h8sim) dejacfg=rtems-h8300-h8sim ;; i386-pc386|i386-qemu) dejacfg=rtems-i386-qemu ;; m68k-mcf5206elite) dejacfg=rtems-m68k-nosim ;; m32c-m32csim) dejacfg=rtems-m32c-m32csim ;; + m32r-m32rsim) dejacfg=rtems-m32r-m32rsim ;; mips-jmr3904) dejacfg=rtems-mips-jmr3904 ;; powerpc-psim) dejacfg=rtems-powerpc-psim ;; sh-simsh1) dejacfg=rtems-sh-simsh1 ;; @@ -402,6 +404,10 @@ j_gcc1() if [ ${do_cxx} = yes ] ; then cxx=",c++" fi + if [ ${cpu} = avr ] ; then + cxx="" + fi + if [ ${do_multilib} = yes ] ; then multilib="--enable-multilib" else |