Skip to content

Commit 6caae0b

Browse files
Anton-2Anton-2
committed
unix: Create __bss_start and _end symbols for Mach-O targets.
It's a hack, but can't find a cleaner way to do it.
1 parent 147c80b commit 6caae0b

4 files changed

Lines changed: 50 additions & 2 deletions

File tree

‎py/nlrx64.S‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232

3333
#if !defined(__CYGWIN__)
3434

35+
#if (defined(__APPLE__) && defined(__MACH__))
36+
#define nlr_jump_fail _nlr_jump_fail
37+
#endif // (defined(__APPLE__) && defined(__MACH__))
38+
3539
/* uint nlr_push(rdi=nlr_buf_t *nlr) */
3640
#if !(defined(__APPLE__) && defined(__MACH__))
3741
.globl nlr_push

‎unix/Makefile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT)
1919

2020
UNAME_S := $(shell uname -s)
2121
ifeq ($(UNAME_S),Darwin)
22-
LDFLAGS = $(LDFLAGS_MOD) -lm -Wl,-map,$@.map
23-
else
22+
LDFLAGS = $(LDFLAGS_MOD) -lm -Wl,-map,$@.map,-order_file,order.def
23+
else
2424
LDFLAGS = $(LDFLAGS_MOD) -lm -Wl,-Map=$@.map,--cref
2525
endif
2626

@@ -70,6 +70,11 @@ SRC_C = \
7070
modsocket.c \
7171
$(SRC_MOD)
7272

73+
# Must be the last file
74+
ifeq ($(UNAME_S),Darwin)
75+
SRC_C += seg_helpers.c
76+
endif
77+
7378
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
7479

7580
include ../py/mkrules.mk

‎unix/order.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
seg_helpers.o: ___bss_start

‎unix/seg_helpers.c‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the Micro Python project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2013, 2014 Damien P. George
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
/*
28+
This is a stub used to create the symbols __bss_start and _end in a Mach-O object file.
29+
Thoses are needed by the GC, and should point to the start and end of the bss section.
30+
We reach this goal by linking this file last (putting _end at the end...), and using an
31+
order file (order.def) to move __bss_start at the start of bss.
32+
33+
TODO: Some pragma to do it inline ?
34+
*/
35+
36+
char __bss_start = 0;
37+
char _end = 0;
38+

0 commit comments

Comments
 (0)