logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

remove-alternative-asm.patch (1365B)


  1. SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
  2. SPDX-License-Identifier: GPL-2.0-only
  3. Our older version of binutils doesn't play very nicely with binutils for a
  4. couple of edgecase macros. It seems that ALTERNATIVE is one of these. As we
  5. know what your system will be (not Xen), we can manually evaluate and write
  6. out the ALTERNATIVEs.
  7. --- linux-4.14.336/arch/x86/entry/entry_32.S 2021-07-31 11:40:07.458032771 +1000
  8. +++ linux-4.14.336/arch/x86/entry/entry_32.S 2021-07-31 11:40:42.835298841 +1000
  9. @@ -412,9 +412,8 @@
  10. movl %esp, %eax
  11. call do_fast_syscall_32
  12. - /* XEN PV guests always use IRET path */
  13. - ALTERNATIVE "testl %eax, %eax; jz .Lsyscall_32_done", \
  14. - "jmp .Lsyscall_32_done", X86_FEATURE_XENPV
  15. + testl %eax, %eax
  16. + jz .Lsyscall_32_done
  17. /* Opportunistic SYSEXIT */
  18. TRACE_IRQS_ON /* User mode traces as IRQs on. */
  19. --- linux-4.14.336/arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:41:40.379731622 +1000
  20. +++ linux-4.14.336/arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:43:40.294633506 +1000
  21. @@ -55,8 +55,6 @@
  22. /* If SYSENTER (Intel) or SYSCALL32 (AMD) is available, use it. */
  23. ALTERNATIVE_2 "", SYSENTER_SEQUENCE, X86_FEATURE_SYSENTER32, \
  24. SYSCALL_SEQUENCE, X86_FEATURE_SYSCALL32
  25. -#else
  26. - ALTERNATIVE "", SYSENTER_SEQUENCE, X86_FEATURE_SEP
  27. #endif
  28. /* Enter using int $0x80 */