about summary refs log tree commit diff stats
path: root/subx/teensy/test5.s
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-07-03 14:24:50 -0700
committerKartik Agaram <vc@akkartik.com>2018-07-03 14:57:39 -0700
commit0defd18cfc5fd3e9190ceb067b859294c5b2677c (patch)
treecb3b1b3a48d14d2f7d97e2c86521dff77f8db2c5 /subx/teensy/test5.s
parent7c71860b87711531f1fd590a9768603a01dc4b18 (diff)
downloadmu-0defd18cfc5fd3e9190ceb067b859294c5b2677c.tar.gz
4308
Undo 4291; turns out the generated ELF binary was no longer running
natively on 32-bit Linux. Even with p_align set to 0.

Agh, not worth my time.
Diffstat (limited to 'subx/teensy/test5.s')
-rw-r--r--subx/teensy/test5.s10
1 files changed, 5 insertions, 5 deletions
diff --git a/subx/teensy/test5.s b/subx/teensy/test5.s
index e4bd0c7e..54a79846 100644
--- a/subx/teensy/test5.s
+++ b/subx/teensy/test5.s
@@ -11,7 +11,7 @@ ehdr:                                                 ; Elf32_Ehdr
               dw      2                               ;   e_type
               dw      3                               ;   e_machine
               dd      1                               ;   e_version
-              dd      $$                              ;   e_entry
+              dd      _start                          ;   e_entry
               dd      phdr - $$                       ;   e_phoff
               dd      0                               ;   e_shoff
               dd      0                               ;   e_flags
@@ -25,11 +25,11 @@ ehdrsize  equ  $ - ehdr
 
 phdr:                                                 ; Elf32_Phdr
               dd      1                               ;   p_type
-              dd      _start - $$                     ;   p_offset
+              dd      0                               ;   p_offset
               dd      $$                              ;   p_vaddr
               dd      $$                              ;   p_paddr
-              dd      codesize                        ;   p_filesz
-              dd      codesize                        ;   p_memsz
+              dd      filesize                        ;   p_filesz
+              dd      filesize                        ;   p_memsz
               dd      5                               ;   p_flags
               dd      0x1000                          ;   p_align
 phdrsize  equ  $ - phdr
@@ -43,4 +43,4 @@ _start:
     dd 0x00000001  ; imm32 operand
   int 0x80
 
-codesize      equ     $ - _start
+filesize      equ     $ - $$