Skip to content

Commit

Permalink
x86/link: don't define our own PTR_SIZE
Browse files Browse the repository at this point in the history
Just reuse the common ULTRA_ARCH_WIDTH macro.

Signed-off-by: Daniil Tatianin <[email protected]>
  • Loading branch information
d-tatianin committed Oct 15, 2023
1 parent c6466b6 commit 1e087ee
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions kernel/arch/x86/link.ld.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ ENTRY(x86_entry)
#ifdef ULTRA_ARCH_EXECUTION_MODE_I686
VIRTUAL_BASE = 0xC0000000;
PHYSICAL_OFFSET = 0x100000;
#define PTR_SIZE 4
#else
VIRTUAL_BASE = 0xFFFFFFFF80000000;
PHYSICAL_OFFSET = 0;
#define PTR_SIZE 8
#endif

#define INT3_OPCODE 0xCC
Expand Down Expand Up @@ -37,7 +35,7 @@ SECTIONS

.rodata : VIRTUAL_BASE_RELATIVE(.rodata)
{
RODATA(PTR_SIZE)
RODATA(ULTRA_ARCH_WIDTH)
} :rodata =0xDEADBEEF

. = ALIGN(4K);
Expand Down

0 comments on commit 1e087ee

Please sign in to comment.