coarray_40.f90: Revise to use dg-additional-options.

	* gfortran.dg/coarray_40.f90: Revise to use dg-additional-options.
	* gfortran.dg/coarray_lib_comm_1.f90: Likewise.

From-SVN: r232005

gcc/testsuite/ChangeLog

+2015-12-30  John David Anglin  <danglin@gcc.gnu.org>
+
+	* gfortran.dg/coarray_40.f90: Revise to use dg-additional-options.
+	* gfortran.dg/coarray_lib_comm_1.f90: Likewise.
+
 2015-12-29  Andre Vehreschild  <vehre@gcc.gnu.org>
 
 	PR fortran/69011

gcc/testsuite/gfortran.dg/coarray_40.f90

 ! { dg-do run }
-! { dg-options "-fcoarray=lib -lcaf_single -latomic" { target libatomic_available } }
-! { dg-options "-fcoarray=lib -lcaf_single" { target { ! libatomic_available } } }
+! { dg-options "-fcoarray=lib -lcaf_single" }
+! { dg-additional-options "-latomic" { target libatomic_available } }
 !
 ! Run-time test for memory consistency
 !

gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90

 ! { dg-do run }
-! { dg-options "-fdump-tree-original -fcoarray=lib -lcaf_single -latomic" { target libatomic_available } }
-! { dg-options "-fdump-tree-original -fcoarray=lib -lcaf_single" { target { ! libatomic_available } } }
+! { dg-options "-fdump-tree-original -fcoarray=lib -lcaf_single" }
+! { dg-additional-options "-latomic" { target libatomic_available } }
 !
 ! Some dependency-analysis check for coarray communication
 !