]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
testsuite: Only run test on target if VMA == LMA
authorTorbjörn SVENSSON <torbjorn.svensson@foss.st.com>
Fri, 16 Sep 2022 17:49:01 +0000 (19:49 +0200)
committerTorbjörn SVENSSON <torbjorn.svensson@foss.st.com>
Fri, 30 Sep 2022 16:28:46 +0000 (18:28 +0200)
Checking that the triplet matches arm*-*-eabi (or msp430-*-*) is not
enough to know if the execution will enter an endless loop, or if it
will give a meaningful result. As the execution test only work when
VMA and LMA are equal, make sure that this condition is met.

gcc/ChangeLog:

* doc/sourcebuild.texi: Document new vma_equals_lma effective
target check.

gcc/testsuite/ChangeLog:

* lib/target-supports.exp (check_effective_target_vma_equals_lma): New.
* c-c++-common/torture/attr-noinit-1.c: Requre VMA == LMA to run.
* c-c++-common/torture/attr-noinit-2.c: Likewise.
* c-c++-common/torture/attr-noinit-3.c: Likewise.
* c-c++-common/torture/attr-persistent-1.c: Likewise.
* c-c++-common/torture/attr-persistent-3.c: Likewise.

Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com>
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
gcc/doc/sourcebuild.texi
gcc/testsuite/c-c++-common/torture/attr-noinit-1.c
gcc/testsuite/c-c++-common/torture/attr-noinit-2.c
gcc/testsuite/c-c++-common/torture/attr-noinit-3.c
gcc/testsuite/c-c++-common/torture/attr-persistent-1.c
gcc/testsuite/c-c++-common/torture/attr-persistent-3.c
gcc/testsuite/lib/target-supports.exp

index 52357cc7aee9446ca1ec39b724efb4c97034ac89..c81e2ffd43a331117b2882dff163d988f85ff836 100644 (file)
@@ -2868,6 +2868,9 @@ Vector alignment is reachable for types of 32 bits or less.
 @item vector_alignment_reachable_for_64bit
 Vector alignment is reachable for types of 64 bits or less.
 
+@item vma_equals_lma
+Target generates executable with VMA equal to LMA for .data section.
+
 @item wchar_t_char16_t_compatible
 Target supports @code{wchar_t} that is compatible with @code{char16_t}.
 
index 877e7647ac9a4843f4ccd2a6460acb8d888df5b0..f84eba0b649e20c46a34cdfec0ad916c5059a100 100644 (file)
@@ -1,4 +1,5 @@
-/* { dg-do run } */
+/* { dg-do link } */
+/* { dg-do run { target { vma_equals_lma } } } */
 /* { dg-require-effective-target noinit } */
 /* { dg-skip-if "data LMA != VMA" { msp430-*-* } { "-mlarge" } } */
 /* { dg-options "-save-temps" } */
index befa2a0bd52263a1a36da110f83aecf2889174c9..4528b9e3cfa20a4552519a88360fecb15e714d69 100644 (file)
@@ -1,4 +1,5 @@
-/* { dg-do run } */
+/* { dg-do link } */
+/* { dg-do run { target { vma_equals_lma } } } */
 /* { dg-require-effective-target noinit } */
 /* { dg-options "-fdata-sections -save-temps" } */
 /* { dg-skip-if "data LMA != VMA" { msp430-*-* } { "-mlarge" } } */
index 519e88a59a60c37682aa4ab51546b951e1e98b0b..2f1745694c9c48b63d2a2c472b1c9291f81a8a1c 100644 (file)
@@ -1,4 +1,5 @@
-/* { dg-do run } */
+/* { dg-do link } */
+/* { dg-do run { target { vma_equals_lma } } } */
 /* { dg-require-effective-target noinit } */
 /* { dg-options "-flto -save-temps" } */
 /* { dg-skip-if "data LMA != VMA" { msp430-*-* } { "-mlarge" } } */
index 72dc3c271928f023ce03627950f777d284051873..b11a515cef86448774c3258e09d38d4b400eed2e 100644 (file)
@@ -1,4 +1,5 @@
-/* { dg-do run } */
+/* { dg-do link } */
+/* { dg-do run { target { vma_equals_lma } } } */
 /* { dg-require-effective-target persistent } */
 /* { dg-skip-if "data LMA != VMA" { msp430-*-* } { "-mlarge" } } */
 /* { dg-options "-save-temps" } */
index 3e4fd28618d966c1b59221e81d775ebde77a8570..068a72af5c8edc09baf2f046a4eb33532fc41781 100644 (file)
@@ -1,4 +1,5 @@
-/* { dg-do run } */
+/* { dg-do link } */
+/* { dg-do run { target { vma_equals_lma } } } */
 /* { dg-require-effective-target persistent } */
 /* { dg-options "-flto -save-temps" } */
 /* { dg-skip-if "data LMA != VMA" { msp430-*-* } { "-mlarge" } } */
index 0a959c63c4aa686894460f708713454f20df0601..7c9dd45f2a7321b703af88880123e52f887a7509 100644 (file)
@@ -370,6 +370,55 @@ proc check_weak_override_available { } {
     return [check_weak_available]
 }
 
+# Return 1 if VMA is equal to LMA for the .data section, 0
+# otherwise.  Cache the result.
+
+proc check_effective_target_vma_equals_lma { } {
+    global tool
+
+    return [check_cached_effective_target vma_equals_lma {
+       set src vma_equals_lma[pid].c
+       set exe vma_equals_lma[pid].exe
+       verbose "check_effective_target_vma_equals_lma  compiling testfile $src" 2
+       set f [open $src "w"]
+       puts $f "#ifdef __cplusplus\nextern \"C\"\n#endif\n"
+       puts $f "int foo = 42; void main() {}"
+       close $f
+       set lines [${tool}_target_compile $src $exe executable ""]
+       file delete $src
+
+       if [string match "" $lines] then {
+           # No error messages
+
+            set objdump_name [find_binutils_prog objdump]
+            set output [remote_exec host "$objdump_name" "--section-headers --section=.data $exe"]
+            set output [lindex $output 1]
+
+            remote_file build delete $exe
+
+            # Example output of objdump:
+            #vma_equals_lma9059.exe:     file format elf32-littlearm
+            #
+            #Sections:
+            #Idx Name          Size      VMA       LMA       File off  Algn
+            #  6 .data         00000558  20000000  08002658  00020000  2**3
+            #                  CONTENTS, ALLOC, LOAD, DATA
+
+            # Capture LMA and VMA columns for .data section
+            if ![ regexp {\d*\d+\s+\.data\s+\d+\s+(\d+)\s+(\d+)} $output dummy vma lma ] {
+                verbose "Could not parse objdump output" 2
+                return 0
+            } else {
+                return [string equal $vma $lma]
+            }
+       } else {
+            remote_file build delete $exe
+            verbose "Could not determine if VMA is equal to LMA. Assuming not equal." 2
+            return 0
+       }
+    }]
+}
+
 # The "noinit" attribute is only supported by some targets.
 # This proc returns 1 if it's supported, 0 if it's not.