shithub: mc

Download patch

ref: 33241b151a0073b639892a6891f84bce94db2ccc
parent: 3321a6568822c6278aa4e85845592596521a523f
author: Ori Bernstein <ori@eigenstate.org>
date: Mon Aug 24 07:23:00 EDT 2015

Fix build on OSX

--- a/libstd/syscall+osx-x64.s
+++ b/libstd/syscall+osx-x64.s
@@ -61,7 +61,6 @@
 	negq %rax
 
 .pipesuccess:
-	movq 80(%rsp),%rdi
 	movl %eax,(%rdi)
 	movl %edx,4(%rdi)
 	xorq %rax,%rax
@@ -76,7 +75,6 @@
 	negq %rax
 
 .lseeksuccess:
-	movq 80(%rsp),%rdi
         shlq $32,%rdx
         orq  %rdx,%rax
 	ret
@@ -91,7 +89,6 @@
 	negq %rax
 
 .gettimeofdaysuccess:
-	movq 80(%rsp),%rdi
 	movq %rax, (%rdi)
 	movl %edx,8(%rdi)
 	xorq %rax,%rax
--- a/mk/bootstrap/bootstrap+Darwin-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Darwin-x86_64.sh
@@ -100,7 +100,7 @@
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd types.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd types.myr 
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd util.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd util.myr 
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd deps.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd deps.myr 
-echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd fsel.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd fsel.myr 
+echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd syssel.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd syssel.myr 
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd parse.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd parse.myr 
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd build.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd build.myr 
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd install.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd install.myr 
@@ -107,7 +107,7 @@
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd clean.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd clean.myr 
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd test.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd test.myr 
 echo 	../6/6m	-I ../libregex -I ../libbio -I ../libstd main.myr ;	../6/6m	-I ../libregex -I ../libbio -I ../libstd main.myr 
-echo 	ld	-pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6 ;	ld	-pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6 
+echo 	ld	-pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o syssel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6 ;	ld	-pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o syssel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6 
 echo 	cd $pwd;	cd $pwd
 echo 	cd $pwd/libregex;	cd $pwd/libregex
 echo 	../6/6m	-I . -I ../libbio -I ../libstd redump.myr ;	../6/6m	-I . -I ../libbio -I ../libstd redump.myr 
--- a/mk/c.mk
+++ b/mk/c.mk
@@ -6,7 +6,7 @@
 _LIBINCPATHS=$(addprefix -I, $(dir $(DEPS)))
 _LIBPATHS=$(addprefix -l, $(patsubst lib%.a,%,$(notdir $(DEPS))))
 
-CFLAGS += -Og -Wall -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -g
+CFLAGS += -O0 -Wall -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -g
 CFLAGS += -MMD -MP -MF ${_DEPSDIR}/$(subst /,-,$*).d
 
 LIB ?= $(INSTLIB)