From 12429939d253f50cc381082dad7cfa5eed3dc9dd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 28 2020 08:49:53 +0000 Subject: import orc-0.4.28-3.el8 --- diff --git a/SOURCES/0001-x86-add-endbr32-and-endbr64-instructions.patch b/SOURCES/0001-x86-add-endbr32-and-endbr64-instructions.patch new file mode 100644 index 0000000..400afa9 --- /dev/null +++ b/SOURCES/0001-x86-add-endbr32-and-endbr64-instructions.patch @@ -0,0 +1,66 @@ +From eac51dc1b6eb89e00ed2294e39949ad056287d1e Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Fri, 19 Jul 2019 16:18:04 +0200 +Subject: [PATCH] x86: add endbr32 and endbr64 instructions + +Issue endbr instructions at the start of generated functions to +make IBT (indirect branch tracking) work. + +Resolves #17 +--- + orc/orcx86.c | 4 ++++ + orc/orcx86insn.c | 2 ++ + orc/orcx86insn.h | 2 ++ + 3 files changed, 8 insertions(+) + +diff --git a/orc/orcx86.c b/orc/orcx86.c +index 02e6b34..d4cc086 100644 +--- a/orc/orcx86.c ++++ b/orc/orcx86.c +@@ -452,6 +452,9 @@ orc_x86_emit_prologue (OrcCompiler *compiler) + orc_compiler_append_code(compiler,"%s:\n", compiler->program->name); + if (compiler->is_64bit) { + int i; ++ ++ orc_x86_emit_cpuinsn_none (compiler, ORC_X86_endbr64); ++ + for(i=0;i<16;i++){ + if (compiler->used_regs[ORC_GP_REG_BASE+i] && + compiler->save_regs[ORC_GP_REG_BASE+i]) { +@@ -459,6 +462,7 @@ orc_x86_emit_prologue (OrcCompiler *compiler) + } + } + } else { ++ orc_x86_emit_cpuinsn_none (compiler, ORC_X86_endbr32); + orc_x86_emit_push (compiler, 4, X86_EBP); + if (compiler->use_frame_pointer) { + orc_x86_emit_mov_reg_reg (compiler, 4, X86_ESP, X86_EBP); +diff --git a/orc/orcx86insn.c b/orc/orcx86insn.c +index 9d93197..a9bdd9f 100644 +--- a/orc/orcx86insn.c ++++ b/orc/orcx86insn.c +@@ -254,6 +254,8 @@ static const OrcSysOpcode orc_x86_opcodes[] = { + { "pshufw", ORC_X86_INSN_TYPE_IMM8_MMXM_MMX, 0, 0x00, 0x0f70 }, + { "movq", ORC_X86_INSN_TYPE_MMXM_MMX, 0, 0x00, 0x0f6f }, + { "movq", ORC_X86_INSN_TYPE_MMXM_MMX_REV, 0, 0x00, 0x0f7f }, ++ { "endbr32", ORC_X86_INSN_TYPE_NONE, 0, 0xf3, 0x0f1efb }, ++ { "endbr64", ORC_X86_INSN_TYPE_NONE, 0, 0xf3, 0x0f1efa }, + }; + + static void +diff --git a/orc/orcx86insn.h b/orc/orcx86insn.h +index d109c95..864e5d6 100644 +--- a/orc/orcx86insn.h ++++ b/orc/orcx86insn.h +@@ -277,6 +277,8 @@ typedef enum { + ORC_X86_pshufw, + ORC_X86_movq_mmx_load, + ORC_X86_movq_mmx_store, ++ ORC_X86_endbr32, ++ ORC_X86_endbr64, + } OrcX86Opcode; + + enum { +-- +2.21.0 + diff --git a/SPECS/orc.spec b/SPECS/orc.spec index 6acdb78..bc7c6a6 100644 --- a/SPECS/orc.spec +++ b/SPECS/orc.spec @@ -1,6 +1,6 @@ Name: orc Version: 0.4.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Oil Run-time Compiler Group: System Environment/Libraries @@ -8,6 +8,9 @@ License: BSD URL: http://cgit.freedesktop.org/gstreamer/orc/ Source0: http://gstreamer.freedesktop.org/src/orc/%{name}-%{version}.tar.xz +# upstream patches +Patch0: 0001-x86-add-endbr32-and-endbr64-instructions.patch + BuildRequires: gtk-doc, libtool %description @@ -49,6 +52,7 @@ The Orc compiler, to produce optimized code. %prep %setup -q +%patch0 -p1 gtkdocize --copy NOCONFIGURE=1 autoreconf -vif @@ -101,6 +105,10 @@ make check %changelog +* Thu Sep 12 2019 Wim Taymans 0.4.28-3 +- x86: add endbr32 and endbr64 instructions +- Resolves: rhbz#1693292 + * Thu Feb 08 2018 Fedora Release Engineering - 0.4.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild