diff options
| -rw-r--r-- | sys/amd64/amd64/locore.S | 6 | ||||
| -rw-r--r-- | sys/amd64/amd64/locore.s | 6 | ||||
| -rw-r--r-- | sys/i386/i386/bioscall.s | 8 | ||||
| -rw-r--r-- | sys/i386/i386/locore.s | 6 |
4 files changed, 26 insertions, 0 deletions
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index e5502ce..68927d5 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -57,6 +57,12 @@ #include "assym.s" +#ifdef __AOUT__ +#define etext _etext +#define edata _edata +#define end _end +#endif + /* * XXX * diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index e5502ce..68927d5 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -57,6 +57,12 @@ #include "assym.s" +#ifdef __AOUT__ +#define etext _etext +#define edata _edata +#define end _end +#endif + /* * XXX * diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s index 3af198a..59600a6 100644 --- a/sys/i386/i386/bioscall.s +++ b/sys/i386/i386/bioscall.s @@ -63,7 +63,11 @@ ENTRY(bios32) movl 16(%ebp),%esi movl 20(%ebp),%edi pushl %ebp +#ifdef __AOUT__ + lcall bioscall_vector /* Stupid a.out gas! */ +#else lcall *bioscall_vector +#endif popl %ebp movl %eax,0(%ebp) movl %ebx,4(%ebp) @@ -127,7 +131,11 @@ ENTRY(bios16_call) lret /* ...continue below */ .globl CNAME(bios16_jmp) CNAME(bios16_jmp): +#ifdef __AOUT__ + lcallw bioscall_vector /* Stupid a.out gas! */ +#else lcallw *bioscall_vector /* 16-bit call */ +#endif jc 1f pushl $0 /* success */ diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index e5502ce..68927d5 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -57,6 +57,12 @@ #include "assym.s" +#ifdef __AOUT__ +#define etext _etext +#define edata _edata +#define end _end +#endif + /* * XXX * |
