From: Laurent GUERBY Date: Fri, 7 Jan 2005 18:52:41 +0000 (+0000) Subject: backport: [multiple changes] X-Git-Tag: releases/gcc-3.4.4~332 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2da02f243b2411239d0e899cc2a5c78ceb20f2d4;p=thirdparty%2Fgcc.git backport: [multiple changes] 2005-01-06 Laurent GUERBY Backport from mainline: 2004-11-23 John David Anglin * ada/acats/run_acats (LD_LIBRARY_PATH): Add previous LD_LIBRARY_PATH to LD_LIBRARY_PATH. Export LD_LIBRARY_PATH. 2004-04-24 Laurent GUERBY Ulrich Weigand * ada/acats/run_all.sh: Define $target variable. 2004-04-24 Laurent GUERBY * ada/acats/run_all.sh: Handle cd2a83c, cd2a91c (target_bit) and ad8011a (target_insn). * ada/acats/support/macro.dfs: Likewise. * ada/acats/support/impbit.adb: New file. From-SVN: r93061 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 994acaef34a2..bbdfbc696aa5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,24 @@ +2005-01-06 Laurent GUERBY + + Backport from mainline: + + 2004-11-23 John David Anglin + + * ada/acats/run_acats (LD_LIBRARY_PATH): Add previous LD_LIBRARY_PATH + to LD_LIBRARY_PATH. Export LD_LIBRARY_PATH. + + 2004-04-24 Laurent GUERBY + Ulrich Weigand + + * ada/acats/run_all.sh: Define $target variable. + + 2004-04-24 Laurent GUERBY + + * ada/acats/run_all.sh: Handle cd2a83c, cd2a91c (target_bit) + and ad8011a (target_insn). + * ada/acats/support/macro.dfs: Likewise. + * ada/acats/support/impbit.adb: New file. + 2005-01-06 Jakub Jelinek * gcc.c-torture/compile/20050105-1.c: New test. diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats index 24d87853e134..b2c62550be75 100755 --- a/gcc/testsuite/ada/acats/run_acats +++ b/gcc/testsuite/ada/acats/run_acats @@ -14,6 +14,7 @@ BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}` PATH=$BASE:$ROOT:$PATH ADA_INCLUDE_PATH=$BASE/ada/rts +LD_LIBRARY_PATH=$ADA_INCLUDE_PATH:$LD_LIBRARY_PATH ADA_OBJECTS_PATH=$ADA_INCLUDE_PATH if [ ! -d $ADA_INCLUDE_PATH ]; then @@ -33,7 +34,7 @@ fi GCC_DRIVER="$BASE/xgcc" GCC="$BASE/xgcc -B$BASE/" -export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_DRIVER GCC +export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_DRIVER GCC LD_LIBRARY_PATH echo '#!/bin/sh' > host_gnatchop echo PATH=`dirname $host_gnatchop`:'$PATH' >> host_gnatchop diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh index d11c6d7ee8fc..033bf407a0f1 100755 --- a/gcc/testsuite/ada/acats/run_all.sh +++ b/gcc/testsuite/ada/acats/run_all.sh @@ -71,10 +71,12 @@ rm -f $dir/acats.sum $dir/acats.log display " === acats configuration ===" +target=`$GCC -dumpmachine` + display target gcc is $GCC display `$GCC -v 2>&1` display host=`gcc -dumpmachine` -display target=`$GCC -dumpmachine` +display target=$target display `type gnatmake` gnatls -v >> $dir/acats.log display "" @@ -88,9 +90,32 @@ cd $dir/support cp $testdir/support/*.ada $testdir/support/*.a $testdir/support/*.tst $dir/support +# Find out the size in bit of an address on the target +target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1 +target_run $dir/support/impbit > $dir/support/impbit.out 2>&1 +target_bit=`cat $dir/support/impbit.out` +echo target_bit="$target_bit" >> $dir/acats.log + +# Find out a suitable asm statement +# Adapted from configure.ac gcc_cv_as_dwarf2_debug_line +case "$target" in + ia64*-*-* | s390*-*-*) + target_insn="nop 0" + ;; + mmix-*-*) + target_insn="swym 0" + ;; + *) + target_insn="nop" + ;; +esac +echo target_insn="$target_insn" >> $dir/acats.log + sed -e "s,ACATS4GNATDIR,$dir,g" \ < $testdir/support/impdef.a > $dir/support/impdef.a sed -e "s,ACATS4GNATDIR,$dir,g" \ + -e "s,ACATS4GNATBIT,$target_bit,g" \ + -e "s,ACATS4GNATINSN,$target_insn,g" \ < $testdir/support/macro.dfs > $dir/support/MACRO.DFS sed -e "s,ACATS4GNATDIR,$dir,g" \ < $testdir/support/tsttests.dat > $dir/support/TSTTESTS.DAT diff --git a/gcc/testsuite/ada/acats/support/macro.dfs b/gcc/testsuite/ada/acats/support/macro.dfs index 000c1f8e28b3..8c3723348ad6 100644 --- a/gcc/testsuite/ada/acats/support/macro.dfs +++ b/gcc/testsuite/ada/acats/support/macro.dfs @@ -99,7 +99,7 @@ BLANKS -- AN INTEGER LITERAL WHOSE VALUE IS THE MINIMUM NUMBER OF BITS -- SUFFICIENT TO HOLD ANY VALUE OF AN ACCESS TYPE. -- USED IN: CD2A83C BD2A02A -ACC_SIZE 32 +ACC_SIZE ACATS4GNATBIT -- $ALIGNMENT -- A VALUE THAT IS LEGITIMATE FOR USE IN A RECORD ALIGNMENT CLAUSE. @@ -220,7 +220,7 @@ LESS_THAN_DURATION -86_400.0 -- MACHINE_CODE. IF THE IMPLEMENTATION DOES NOT SUPPORT MACHINE -- CODE THEN USE THE ADA NULL STATEMENT (I.E. NULL; ). -- USED IN: AD8011A BD8001A BD8002A BD8004A BD8004B -MACHINE_CODE_STATEMENT Asm_Insn'(Asm ("nop")); +MACHINE_CODE_STATEMENT Asm_Insn'(Asm ("ACATS4GNATINSN")); -- $MAX_INT -- AN INTEGER LITERAL WHOSE VALUE IS SYSTEM.MAX_INT. @@ -271,7 +271,7 @@ RECORD_NAME Asm_Insn -- AN INTEGER LITERAL WHOSE VALUE IS THE NUMBER OF BITS REQUIRED TO -- HOLD A TASK OBJECT. -- USED IN: CD2A91C -TASK_SIZE 32 +TASK_SIZE ACATS4GNATBIT -- $TASK_STORAGE_SIZE -- THE NUMBER OF STORAGE UNITS REQUIRED FOR A TASK ACTIVATION.