falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `gcc -E` for `cpp` (#1639) 

* Fix cpp for macs?

* Add comment

* Move cppflags with cpp
This commit is contained in:
Derek Hensley 2024-05-26 20:01:31 -07:00 committed by GitHub
parent b7e5468ca1
commit 659e2b5088
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -87,12 +87,6 @@ BASEROM_DIR := baseroms/$(VERSION)
BUILD_DIR := build/$(VERSION) BUILD_DIR := build/$(VERSION)
EXTRACTED_DIR := extracted/$(VERSION) EXTRACTED_DIR := extracted/$(VERSION)
CPPFLAGS += -P
ifeq ($(DETECTED_OS), macos)
CPPFLAGS += -xc++
endif
#### Tools #### #### Tools ####
ifneq ($(shell type $(MIPS_BINUTILS_PREFIX)ld >/dev/null 2>/dev/null; echo $$?), 0) ifneq ($(shell type $(MIPS_BINUTILS_PREFIX)ld >/dev/null 2>/dev/null; echo $$?), 0)
@ -143,7 +137,11 @@ ifeq ($(RUN_CC_CHECK),0)
CC_CHECK_COMP := @: CC_CHECK_COMP := @:
endif endif
CPP := cpp # The `cpp` command behaves differently on macOS (it behaves as if
# `-traditional-cpp` was passed) so we use `gcc -E` instead.
CPP := gcc -E
CPPFLAGS += -P -xc -fno-dollars-in-identifiers
MKLDSCRIPT := tools/buildtools/mkldscript MKLDSCRIPT := tools/buildtools/mkldscript
MKDMADATA := tools/buildtools/mkdmadata MKDMADATA := tools/buildtools/mkdmadata
ZAPD := tools/ZAPD/ZAPD.out ZAPD := tools/ZAPD/ZAPD.out

8
tools/disasm/disasm.py
View File

@ -1097,10 +1097,10 @@ def find_symbols_in_rodata(section):
def asm_header(section_name: str): def asm_header(section_name: str):
return f""".include "macro.inc" return f""".include "macro.inc"
# assembler directives /* assembler directives */
.set noat # allow manual use of $at .set noat /* allow manual use of $at */
.set noreorder # don't insert nops after branches .set noreorder /* don't insert nops after branches */
.set gp=64 # allow use of 64-bit general purpose registers .set gp=64 /* allow use of 64-bit general purpose registers */
.section {section_name} .section {section_name}