head	1.1;
access;
symbols
	RELEASE_8_3_0:1.1;
locks; strict;
comment	@# @;


1.1
date	2012.01.12.14.24.37;	author culot;	state Exp;
branches;
next	;


desc
@@


1.1
log
@- Update to 20111026 (corresponding to gcc 4.6.2)
- Set default options to build all five languages (Ada, C, C++, ObjC, Fortran)

Maintainer notes:
- Previously GNAT-Aux was built from a custom tarball provided by dragonlace.net.
Now real gcc source tarballs are used, and then patched.
- The standard patch mechanism is not used. Composite diff files generated and
provided by dragonlace.net are applied as needed.
- This sets the stage to sync GNAT-Aux with gcc 4.7.0 when its released.

PR:		ports/163914
Submitted by:	John Marino <draco@@marino.st> (maintainer)
@
text
@--- gcc/testsuite/ada/acats/run_acats.orig
+++ gcc/testsuite/ada/acats/run_acats
@@@@ -5,20 +5,6 @@@@
    exit 1
 fi
 
-# Provide which replacement.
-#
-# type -p is missing from Solaris 2 /bin/sh and /bin/ksh (ksh88), but both
-# ksh93 and bash have it.
-# type output format differs between ksh88 and ksh93, so avoid it if
-# type -p is present.  Unfortunately, HP-UX /bin/sh ignores -p with type.
-# Fall back to whence which ksh88 and ksh93 provide, but bash does not.
-
-which () {
-    path=`type -p $* 2>/dev/null` && { echo $path | awk '{print $NF}'; return 0; }
-    path=`type $* 2>/dev/null` && { echo $path | awk '{print $NF}'; return 0; }
-    path=`whence $* 2>/dev/null` && { echo $path; return 0; }
-    return 1
-}
 
 # Set up environment to use the Ada compiler from the object tree
 
--- gcc/testsuite/ada/acats/run_all.sh.orig
+++ gcc/testsuite/ada/acats/run_all.sh
@@@@ -35,6 +35,14 @@@@
   echo "$@@" >> $dir/acats.log
 }
 
+inform () {
+  printf "%04d    %7s" $1 $2
+}
+
+disinform () {
+  printf "\r"
+}
+
 dir=`${PWDCMD-pwd}`
 
 if [ "$testdir" = "" ]; then
@@@@ -197,6 +205,18 @@@@
 glob_countn=0
 glob_countok=0
 glob_countu=0
+countdown=0
+
+for chapter in $chapters; do
+   if [ -d $dir/tests/$chapter ]; then
+      cd $dir/tests/$chapter
+      ls *.a *.ada *.adt *.am *.dep 2> /dev/null | sed -e 's/\(.*\)\..*/\1/g' | \
+      cut -c1-7 | sort | uniq | comm -23 - $dir/support/norun.lst \
+        > $dir/tests/$chapter/${chapter}.lst
+      countn=`wc -l < $dir/tests/$chapter/${chapter}.lst`
+      countdown=`expr $countdown + $countn`
+   fi
+done
 
 for chapter in $chapters; do
    display Running chapter $chapter ...
@@@@ -207,10 +227,6 @@@@
       continue
    fi
 
-   cd $dir/tests/$chapter
-   ls *.a *.ada *.adt *.am *.dep 2> /dev/null | sed -e 's/\(.*\)\..*/\1/g' | \
-   cut -c1-7 | sort | uniq | comm -23 - $dir/support/norun.lst \
-     > $dir/tests/$chapter/${chapter}.lst 
    countn=`wc -l < $dir/tests/$chapter/${chapter}.lst`
    glob_countn=`expr $glob_countn + $countn`
    counti=0
@@@@ -233,10 +249,13 @@@@
       if [ $? -eq 0 ]; then
          extraflags="$extraflags -gnat95"
       fi
+      inform $countdown $i
+      countdown=`expr $countdown - 1`
       test=$dir/tests/$chapter/$i
       mkdir $test && cd $test >> $dir/acats.log 2>&1
 
       if [ $? -ne 0 ]; then
+         disinform
          display "FAIL:	$i"
          failed="${failed}${i} "
          clean_dir
@@@@ -260,6 +279,7 @@@@
         cxh1001) extraflags="-a -f"; echo "pragma Normalize_Scalars;" > gnat.adc
       esac
       if [ "$main" = "" ]; then
+         disinform
          display "FAIL:	$i"
          failed="${failed}${i} "
          clean_dir
@@@@ -268,6 +288,7 @@@@
 
       target_gnatmake $extraflags -I$dir/support $main >> $dir/acats.log 2>&1
       if [ $? -ne 0 ]; then
+         disinform
          display "FAIL:	$i"
          failed="${failed}${i} "
          clean_dir
@@@@ -282,6 +303,7 @@@@
       target_run $dir/tests/$chapter/$i/$binmain > $dir/tests/$chapter/$i/${i}.log 2>&1
       cd $dir/tests/$chapter/$i
       cat ${i}.log >> $dir/acats.log
+      disinform
       egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1
       if [ $? -ne 0 ]; then
          grep 'tasking not implemented' ${i}.log > /dev/null 2>&1
--- gcc/testsuite/gnat.dg/test_raise_from_pure.adb.orig
+++ gcc/testsuite/gnat.dg/test_raise_from_pure.adb
@@@@ -1,4 +1,4 @@@@
--- { dg-do run { xfail arm*-*-* } }
+-- { dg-do run { xfail arm*-*-* *-*-openbsd* } }
 -- { dg-options "-O2" }
 
 -- This is an optimization test and its failure is only a missed optimization.
--- /dev/null
+++ gcc/testsuite/gnat.dg/unchecked_convert5.txt
@@@@ -0,0 +1,9 @@@@
+The test "unchecked_converted5.adb" was deleted because it only
+supportes the following targets:
+
+  hppa*
+  sparc*
+  powerpc*
+
+Currently I'm not working with any of those, so until that changes, the
+test will be absent to lower the "unsupported" test number.
--- /dev/null
+++ gcc/testsuite/gnat.dg/unchecked_convert6.txt
@@@@ -0,0 +1,9 @@@@
+The test "unchecked_converted6.adb" was deleted because it only
+supportes the following targets:
+
+  hppa*
+  sparc*
+  powerpc*
+
+Currently I'm not working with any of those, so until that changes, the
+test will be absent to lower the "unsupported" test number.
--- gcc/testsuite/gnat.dg/unchecked_convert5.adb
+++ /dev/null
@@@@ -1,22 +0,0 @@@@
--- { dg-do run { target hppa*-*-* sparc*-*-* powerpc*-*-* } }
-
-with Unchecked_Conversion;
-
-procedure Unchecked_Convert5 is
-
-  subtype c_1 is string(1..1);
-
-  function int2c1 is  -- { dg-warning "different sizes" }
-    new unchecked_conversion (source => integer, target => c_1);
-
-  c1 : c_1;
-
-begin
-
-  c1 := int2c1(16#12#);
-
-  if c1 (1) /= ASCII.Nul then
-    raise Program_Error;
-  end if;
-
-end;
--- gcc/testsuite/gnat.dg/unchecked_convert6.adb
+++ /dev/null
@@@@ -1,22 +0,0 @@@@
--- { dg-do run { target hppa*-*-* sparc*-*-* powerpc*-*-* } }
-
-with Unchecked_Conversion;
-
-procedure Unchecked_Convert6 is
-
-  subtype c_5 is string(1..5);
-
-  function int2c5 is  -- { dg-warning "different sizes" }
-    new unchecked_conversion (source => integer, target => c_5);
-
-  c5 : c_5;
-
-begin
-
-  c5 := int2c5(16#12#);
-
-  if c5 (4) /= ASCII.DC2 then
-    raise Program_Error;
-  end if;
-
-end;
@
