aboutsummaryrefslogtreecommitdiff
path: root/unix
diff options
context:
space:
mode:
authorstijn2015-01-08 10:32:45 +0100
committerstijn2015-01-08 15:29:44 +0100
commitafd6c8e1d2a2c24595194879481987cec3b57f8a (patch)
tree918ec7c40ee16d00c7f085a853b6f6e2e1010247 /unix
parent181bfb6db2a089442e5b3d38d68b1236b8aa0eb0 (diff)
Remove obsolete bss-related code/build features
GC for unix/windows builds doesn't make use of the bss section anymore, so we do not need the (sometimes complicated) build features and code related to it
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile15
-rw-r--r--unix/seg_helpers.c38
2 files changed, 2 insertions, 51 deletions
diff --git a/unix/Makefile b/unix/Makefile
index e7e0d354b..ea6590ac7 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -35,8 +35,8 @@ endif
# if necessary override the value of 'CC' set in py/mkenv.mk
ifeq ($(UNAME_S),Darwin)
CC = clang
-# Use clang syntax for map file and set osx specific flags
-LDFLAGS_ARCH = -Wl,-order_file,$(BUILD)/order.def -Wl,-map,$@.map
+# Use clang syntax for map file
+LDFLAGS_ARCH = -Wl,-map,$@.map
else
# Use gcc syntax for map file
LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref
@@ -92,17 +92,6 @@ SRC_C = \
alloc.c \
$(SRC_MOD)
-ifeq ($(UNAME_S),Darwin)
-# Must be the last file in list of sources
-SRC_C += seg_helpers.c
-
-# making seg_helpers.c rely on order.def will force order.def to be created
-seg_helpers.c: $(BUILD)/order.def
-
-# create order.def in build directory
-$(BUILD)/order.def:
- $(Q)echo "seg_helpers.o: ___bss_start" > $@
-endif
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/unix/seg_helpers.c b/unix/seg_helpers.c
deleted file mode 100644
index 1684f7a8f..000000000
--- a/unix/seg_helpers.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/*
- This is a stub used to create the symbols __bss_start and _end in a Mach-O object file.
- Thoses are needed by the GC, and should point to the start and end of the bss section.
- We reach this goal by linking this file last (putting _end at the end...), and using an
- order file (order.def) to move __bss_start at the start of bss.
-
- TODO: Some pragma to do it inline ?
-*/
-
-char __bss_start = 0;
-char _end = 0;
-