zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Maybe allow assembly on Intel Macs? - attempt 2

Browse source 
SVN r2537 (trunk)
This commit is contained in:
Randy Heit 2010-08-13 22:12:42 +00:00
parent 09bd076b17
commit 1063a98c47
5 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -299,9 +299,9 @@ if( NOT NO_ASM )
if( APPLE )
set( ASM_FLAGS -fmacho -DM_TARGET_MACHO )
else( APPLE )
set( ASM_FLAGS -felf )
set( ASM_FLAGS -felf -DM_TARGET_LINUX )
endif( APPLE )
set( ASM_FLAGS "${ASM_FLAGS}" -DM_TARGET_LINUX -i${CMAKE_CURRENT_SOURCE_DIR}/ )
set( ASM_FLAGS "${ASM_FLAGS}" -i${CMAKE_CURRENT_SOURCE_DIR}/ )
set( ASM_SOURCE_EXTENSION .asm )
endif( X64 )
else( UNIX )

9
src/asm_ia32/a.asm
View file

@ -100,8 +100,8 @@ setupvlineasm:
%endif
%ifdef M_TARGET_MACHO
GLOBAL rtext_a_start
rtext_a_start:
GLOBAL _rtext_a_start
_rtext_a_start:
%endif
;eax = xscale
@ -334,6 +334,7 @@ setupmvlineasm:
mov ecx, dword [esp+4]
mov byte [maskmach3a+2], cl
mov byte [machmv13+2], cl
mov byte [machmv14+2], cl
mov byte [machmv15+2], cl
mov byte [machmv16+2], cl
@ -549,6 +550,6 @@ mvcase0: jmp beginmvlineasm4
align 16
%ifdef M_TARGET_MACHO
GLOBAL rtext_a_end
rtext_a_end:
GLOBAL _rtext_a_end
_rtext_a_end:
%endif

8
src/asm_ia32/tmap.asm
View file

@ -292,8 +292,8 @@ aret: ret
%endif
%ifdef M_TARGET_MACHO
GLOBAL rtext_tmap_start
rtext_tmap_start:
GLOBAL _rtext_tmap_start
_rtext_tmap_start:
%endif
rtext_start:
@ -1748,8 +1748,8 @@ ac4nil: pop edi
rtext_end:
%ifdef M_TARGET_MACHO
GLOBAL rtext_tmap_end
rtext_tmap_end:
GLOBAL _rtext_tmap_end
_rtext_tmap_end:
%endif
align 16

8
src/asm_ia32/tmap2.asm
View file

@ -220,8 +220,8 @@ SetTiltedSpanSize:
SECTION .rtext progbits alloc exec write align=64
%else
SECTION .text align=64
GLOBAL rtext_tmap2_start
rtext_tmap2_start:
GLOBAL _rtext_tmap2_start
_rtext_tmap2_start:
%endif
rtext_start:
@ -635,6 +635,6 @@ fetch10 mov al,[ebp+esi+SPACEFILLER4]
rtext_end:
%ifdef M_TARGET_MACHO
GLOBAL rtext_tmap2_end
rtext_tmap2_end:
GLOBAL _rtext_tmap2_end
_rtext_tmap2_end:
%endif

8
src/asm_ia32/tmap3.asm
View file

@ -82,8 +82,8 @@ setupvlinetallasm:
%ifdef M_TARGET_MACHO
SECTION .text align=64
GLOBAL rtext_tmap3_start
rtext_tmap3_start:
GLOBAL _rtext_tmap3_start
_rtext_tmap3_start:
%else
SECTION .rtext progbits alloc exec write align=64
%endif
@ -339,6 +339,6 @@ shift12: shr ecx,16
ret
%ifdef M_TARGET_MACHO
GLOBAL rtext_tmap3_end
rtext_tmap3_end:
GLOBAL _rtext_tmap3_end
_rtext_tmap3_end:
%endif