diff options
| author | Alex Richardson <alexrichardson@google.com> | 2023-06-07 13:30:11 -0700 |
|---|---|---|
| committer | Alex Richardson <alexrichardson@google.com> | 2023-06-07 15:55:50 -0700 |
| commit | c2a31bf8a6bbced04d9c63325a2de24842dbb780 (patch) | |
| tree | 81d190137e473d1a9cdc9522c381030697cb5010 | |
| parent | 4a9d0c33bd3e532aa369d8362a7faf1ba3cfd26a (diff) | |
| download | lk-c2a31bf8a6bbced04d9c63325a2de24842dbb780.tar.gz | |
[x86][clang] Make return mnemonic compatible with clang
GCC appears to accept the Intel retf syntax in AT&T mode but clang is
stricter and requires use of lret.
| -rw-r--r-- | arch/x86/64/start.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/64/start.S b/arch/x86/64/start.S index b11e8bca..7637525a 100644 --- a/arch/x86/64/start.S +++ b/arch/x86/64/start.S @@ -74,7 +74,7 @@ real_start: /* far jump to load the CS from our GDT */ pushl $CODE_SELECTOR pushl $PHYS(.Lfarjump) - retf + lret .Lfarjump: @@ -185,7 +185,7 @@ paging_setup: /* Use a far jump to get into 64bit mode */ pushl $CODE_64_SELECTOR pushl $PHYS(farjump64) - retf + lret .align 8 .code64 |