x86: always set ISA_1_BASELINE property for 64-bit objects

The baseline was, afaik, specifically chosen to align with the baseline
ISA of x86-64. It therefore makes no sense to emit that property only
conditionally; if anything it confuses tools analyzing the difference
between generated object files, which may result from just
added / changed / removed (entirely ISA-independent) code, without any
change to the enabled extensions. Compilers, after all, are free to use
these baseline "extensions" when generating 64-bit code.

While changing the one testcase that needs adjustment, also correct its
misleading name (to be in sync with the filename).

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 6720bc8e38b1f5118faa318e8872e6b4f9a8540a..922c9588fd0f57ee2237c8a258325a3f47fd7686 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -12195,7 +12195,8 @@ output_insn (const struct last_insn *last_insn)
       if (is_cpu (&i.tm, CpuXSAVEC))
        x86_feature_2_used |= GNU_PROPERTY_X86_FEATURE_2_XSAVEC;
 
-      if (x86_feature_2_used
+      if (object_64bit
+         || x86_feature_2_used
          || is_cpu (&i.tm, CpuCMOV)
          || is_cpu (&i.tm, CpuSYSCALL)
          || i.tm.mnem_off == MN_cmpxchg8b)

diff --git a/gas/testsuite/gas/i386/x86-64-property-14.d b/gas/testsuite/gas/i386/x86-64-property-14.d
index 41503c310ba37687d1be1df10d4a86e11c7cf538..c4f2ae3735bd8a8d82e9e713074ceb0757eeac80 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-property-14.d
+++ b/gas/testsuite/gas/i386/x86-64-property-14.d
@@ -1,9 +1,9 @@
-#name: x86-64 property 13
+#name: x86-64 property 14
 #as: -mx86-used-note=yes --generate-missing-build-notes=no
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-v2
+      Properties: x86 ISA used: x86-64-baseline, x86-64-v2
        x86 feature used: x86

diff --git a/ld/testsuite/ld-x86-64/pr24322a-x32.d b/ld/testsuite/ld-x86-64/pr24322a-x32.d
index 4bbe33ca355ae709cfdcd5e564f013390f7b7a1d..8009f910974740bcd85c0dae6095f1bd95cb87b4 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24322a-x32.d
+++ b/ld/testsuite/ld-x86-64/pr24322a-x32.d
@@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24322a.d b/ld/testsuite/ld-x86-64/pr24322a.d
index 4a790571cd7957f18152139f868035264bb7b6df..6ddb7a7163d3e62665e9897110d27f32dd9e1e22 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24322a.d
+++ b/ld/testsuite/ld-x86-64/pr24322a.d
@@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24322b-x32.d b/ld/testsuite/ld-x86-64/pr24322b-x32.d
index 8356f3a4456998722e7bfd0249887e5bc1c500e8..76ebd1cfa37e0e9ec16989cf06d4bdeaef172693 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24322b-x32.d
+++ b/ld/testsuite/ld-x86-64/pr24322b-x32.d
@@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24322b.d b/ld/testsuite/ld-x86-64/pr24322b.d
index deca33e966476c2e0ffdea2338a488b8db2b8d96..6ee01464434fd2a238c3d14ba33f2474c9d50d82 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24322b.d
+++ b/ld/testsuite/ld-x86-64/pr24322b.d
@@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24458a-x32.d b/ld/testsuite/ld-x86-64/pr24458a-x32.d
index 6a673c8c70dfbc7e353942ec7197d826e749752d..9909f1760d6675120b3e387ccafe673bf44f8019 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24458a-x32.d
+++ b/ld/testsuite/ld-x86-64/pr24458a-x32.d
@@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24458a.d b/ld/testsuite/ld-x86-64/pr24458a.d
index 73fbcaebcf773e0f7f93d0620915b980d4a0c492..d0fbc3390fb56b621ed75d9b842892817fd261d4 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24458a.d
+++ b/ld/testsuite/ld-x86-64/pr24458a.d
@@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24458b-x32.d b/ld/testsuite/ld-x86-64/pr24458b-x32.d
index d69083075a69bca0297c3bf356b2cd8673913e0b..9f80ed20d99220301543bbe1525e30b48a3c61a6 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24458b-x32.d
+++ b/ld/testsuite/ld-x86-64/pr24458b-x32.d
@@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24458b.d b/ld/testsuite/ld-x86-64/pr24458b.d
index ae78c974a196aae8225ef4b6d999f4c6040b83c5..ee1894894d1fe3711ef2add249c43ec23b71e462 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24458b.d
+++ b/ld/testsuite/ld-x86-64/pr24458b.d
@@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24458c-x32.d b/ld/testsuite/ld-x86-64/pr24458c-x32.d
index b934c4bb673ecfbe8f36eb96a68593abe069dc5c..7107c3f9892f921605f64ca9b34b06b67dc52747 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24458c-x32.d
+++ b/ld/testsuite/ld-x86-64/pr24458c-x32.d
@@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/pr24458c.d b/ld/testsuite/ld-x86-64/pr24458c.d
index 7016655a93378425c2f508664007788c1e50637a..690088a532fb957469ff37386270e5bd94dc7285 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr24458c.d
+++ b/ld/testsuite/ld-x86-64/pr24458c.d
@@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/property-1a.r b/ld/testsuite/ld-x86-64/property-1a.r
index 7c41da862e20aaae82e1990bb54764ff74a08961..cbdd6477a451643824c0e47698352cc9719da486 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-1a.r
+++ b/ld/testsuite/ld-x86-64/property-1a.r
@@ -4,6 +4,6 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: no copy on protected 
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline
 
 #pass

diff --git a/ld/testsuite/ld-x86-64/property-2a.r b/ld/testsuite/ld-x86-64/property-2a.r
index ab94fdf14a33033790bda729a29d9389df588d47..51bfde816333c0342023d7d581d61e5f92b0bec4 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-2a.r
+++ b/ld/testsuite/ld-x86-64/property-2a.r
@@ -4,6 +4,6 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: stack size: 0x800000
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline
 
 #pass

diff --git a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
index 226bfca6342e03eb4be9155df0185155a84905c1..cf5046f6e0294b9b3f59628e32bd4646e7a24106 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
+++ b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
@@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
       Properties: no copy on protected 
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/property-x86-4a.d b/ld/testsuite/ld-x86-64/property-x86-4a.d
index 0bec21f855099a9edbd60dab8dca38f636593345..7c2bb782d89893e7086e35b0c10d5ab8256809c2 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-4a.d
+++ b/ld/testsuite/ld-x86-64/property-x86-4a.d
@@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000028      NT_GNU_PROPERTY_TYPE_0
       Properties: no copy on protected 
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt5-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt5-x32.d
index f03b321c1a25d2f0903a769525d3f5d5eb47e2fd..d9bf59eb963d7ba053224f9c3dc9cbe3eda3ea90 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-ibt5-x32.d
+++ b/ld/testsuite/ld-x86-64/property-x86-ibt5-x32.d
@@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt5.d b/ld/testsuite/ld-x86-64/property-x86-ibt5.d
index 101f44a25db583891bfc420b86d0b5bb9850de92..212c3b2b9a39e571e8b5e3cfa5d56d989d526995 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-ibt5.d
+++ b/ld/testsuite/ld-x86-64/property-x86-ibt5.d
@@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d b/ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d
index 623dfbd979ccd45d2d8d3c4339ee2a7583515db7..58159b03a7c7cfda651bab4941d63cdf1c4733a1 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d
+++ b/ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d
@@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: LAM_U48, LAM_U57
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/property-x86-lam-u57-5.d b/ld/testsuite/ld-x86-64/property-x86-lam-u57-5.d
index d0b69e67e271c28016b408135f32c9811dce0358..6401ce888236afb5659be3decf73bdaa0a425352 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-lam-u57-5.d
+++ b/ld/testsuite/ld-x86-64/property-x86-lam-u57-5.d
@@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: LAM_U57
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk5-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk5-x32.d
index 0199d3afa045454a46280b449efae7c755e0ccd4..f78e6f42805c48ce288bb4cae616a42b7f1e415e 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-shstk5-x32.d
+++ b/ld/testsuite/ld-x86-64/property-x86-shstk5-x32.d
@@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline

diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk5.d b/ld/testsuite/ld-x86-64/property-x86-shstk5.d
index bba3476e822eff76f75bac3ffdcd15093ff2cd78..c96782cdfb42873fbbe24abd7e664149bd58ae68 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-shstk5.d
+++ b/ld/testsuite/ld-x86-64/property-x86-shstk5.d
@@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property
   GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
        x86 feature used: x86
-       x86 ISA used: 
+       x86 ISA used: x86-64-baseline