Skip to content

Commit 4947dad

Browse files
committed
Donot compile md.S when not use builtin setjmp.
1 parent dc058a8 commit 4947dad

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
DARWIN_15.6.0_DBG
1+
DARWIN_*_DBG
2+
LINUX_*_DBG
23
obj
34
st.pc

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ CFLAGS += -arch ppc
139139
LDFLAGS += -arch ppc
140140
endif
141141
ifeq ($(INTEL), yes)
142-
CFLAGS += -arch x86_64
143-
LDFLAGS += -arch x86_64
142+
CFLAGS += -arch i386 -arch x86_64
143+
LDFLAGS += -arch i386 -arch x86_64
144144
endif
145145
LDFLAGS += -dynamiclib -install_name /sw/lib/libst.$(MAJOR).$(DSO_SUFFIX) -compatibility_version $(MAJOR) -current_version $(VERSION)
146146
OTHER_FLAGS = -Wall

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ For OSX, user must specifies the valgrind header files:
6868
make darwin-debug EXTRA_CFLAGS="-DMD_HAVE_KQUEUE -DMD_VALGRIND -I/usr/local/include"
6969
```
7070

71+
> Remark: Latest OSX does not support ST, please use docker to run ST.
72+
7173
## Valgrind
7274

7375
How to debug with gdb under valgrind, read [valgrind manual](http://valgrind.org/docs/manual/manual-core-adv.html#manual-core-adv.gdbserver-simple).

md.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#if defined(MD_USE_BUILTIN_SETJMP)
2+
13
/*
24
* Portions created by SGI are Copyright (C) 2000 Silicon Graphics, Inc.
35
* All Rights Reserved.
@@ -504,3 +506,4 @@
504506

505507
#endif
506508

509+
#endif

md.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@
420420

421421
#elif defined(__arm__)
422422
#define MD_STACK_GROWS_DOWN
423+
/* https://github.com/ossrs/state-threads/issues/1#issuecomment-244648573 */
423424
#define MD_USE_BUILTIN_SETJMP
424425

425426
/* force to use glibc solution, hack the guard jmpbuf from michaeltalyansky */

0 commit comments

Comments
 (0)