diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2020-10-09 06:06:56 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2021-01-07 13:10:13 -0800 |
commit | ecce11aa0752735c4fd730da6e7c9e0b98e12fb8 (patch) | |
tree | 985a02d3524d901f746cf085e2b68e34cde776aa /sysdeps/x86/link_map.h | |
parent | 9e97f239eae1f2b1d2e694d844c0f6fd7c4dd271 (diff) | |
download | glibc-ecce11aa0752735c4fd730da6e7c9e0b98e12fb8.zip glibc-ecce11aa0752735c4fd730da6e7c9e0b98e12fb8.tar.gz glibc-ecce11aa0752735c4fd730da6e7c9e0b98e12fb8.tar.bz2 |
x86: Support GNU_PROPERTY_X86_ISA_1_V[234] marker [BZ #26717]
GCC 11 supports -march=x86-64-v[234] to enable x86 micro-architecture ISA
levels:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97250
and -mneeded to emit GNU_PROPERTY_X86_ISA_1_NEEDED property with
GNU_PROPERTY_X86_ISA_1_V[234] marker:
https://gitlab.com/x86-psABIs/x86-64-ABI/-/merge_requests/13
Binutils support for GNU_PROPERTY_X86_ISA_1_V[234] marker were added by
commit b0ab06937385e0ae25cebf1991787d64f439bf12
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Oct 30 06:49:57 2020 -0700
x86: Support GNU_PROPERTY_X86_ISA_1_BASELINE marker
and
commit 32930e4edbc06bc6f10c435dbcc63131715df678
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Oct 9 05:05:57 2020 -0700
x86: Support GNU_PROPERTY_X86_ISA_1_V[234] marker
GNU_PROPERTY_X86_ISA_1_NEEDED property in x86 ELF binaries indicate the
micro-architecture ISA level required to execute the binary. The marker
must be added by programmers explicitly in one of 3 ways:
1. Pass -mneeded to GCC.
2. Add the marker in the linker inputs as this patch does.
3. Pass -z x86-64-v[234] to the linker.
Add GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234]
marker support to ld.so if binutils 2.32 or newer is used to build glibc:
1. Add GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234]
markers to elf.h.
2. Add GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234]
marker to abi-note.o based on the ISA level used to compile abi-note.o,
assuming that the same ISA level is used to compile the whole glibc.
3. Add isa_1 to cpu_features to record the supported x86 ISA level.
4. Rename _dl_process_cet_property_note to _dl_process_property_note and
add GNU_PROPERTY_X86_ISA_1_V[234] marker detection.
5. Update _rtld_main_check and _dl_open_check to check loaded objects
with the incompatible ISA level.
6. Add a testcase to verify that dlopen an x86-64-v4 shared object fails
on lesser platforms.
7. Use <get-isa-level.h> in dl-hwcaps-subdirs.c and tst-glibc-hwcaps.c.
Tested under i686, x32 and x86-64 modes on x86-64-v2, x86-64-v3 and
x86-64-v4 machines.
Marked elf/tst-isa-level-1 with x86-64-v4, ran it on x86-64-v3 machine
and got:
[hjl@gnu-cfl-2 build-x86_64-linux]$ ./elf/tst-isa-level-1
./elf/tst-isa-level-1: CPU ISA level is lower than required
[hjl@gnu-cfl-2 build-x86_64-linux]$
Diffstat (limited to 'sysdeps/x86/link_map.h')
-rw-r--r-- | sysdeps/x86/link_map.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sysdeps/x86/link_map.h b/sysdeps/x86/link_map.h index 8074739..4c46a25 100644 --- a/sysdeps/x86/link_map.h +++ b/sysdeps/x86/link_map.h @@ -16,12 +16,16 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -/* If this object is enabled with CET. */ +/* if this object has GNU property. */ enum { - lc_unknown = 0, /* Unknown CET status. */ - lc_none = 1 << 0, /* Not enabled with CET. */ - lc_ibt = 1 << 1, /* Enabled with IBT. */ - lc_shstk = 1 << 2, /* Enabled with STSHK. */ - lc_ibt_and_shstk = lc_ibt | lc_shstk /* Enabled with both. */ - } l_cet:3; + lc_property_unknown = 0, /* Unknown property status. */ + lc_property_none = 1 << 0, /* No property. */ + lc_property_valid = 1 << 1 /* Has valid property. */ + } l_property:2; + +/* GNU_PROPERTY_X86_FEATURE_1_AND of this object. */ +unsigned int l_x86_feature_1_and; + +/* GNU_PROPERTY_X86_ISA_1_NEEDED of this object. */ +unsigned int l_x86_isa_1_needed; |