summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2016-11-19 11:19:09 (GMT)
committer Chris Young <chris@unsatisfactorysoftware.co.uk>2016-11-19 11:19:09 (GMT)
commitd171f413b92004d5c349036306e15ecc79a8e73b (patch)
tree47b7ebf11e7828bce6650faef99f034ae2d43ba7
parent51ba0d354c750b4bb22e2d368e3893da566ea171 (diff)
parentff3eeea2ff1a9a2ad04984017c76ce910e465170 (diff)
downloadtoolchains-d171f413b92004d5c349036306e15ecc79a8e73b.tar.gz
toolchains-d171f413b92004d5c349036306e15ecc79a8e73b.tar.bz2
Update clib2 to v1.207
-rw-r--r--m68k-unknown-amigaos/Makefile2
-rw-r--r--m68k-unknown-amigaos/recipes/patches/clib2/clib2.GNUmakefile.68k.p27
-rw-r--r--m68k-unknown-amigaos/recipes/patches/clib2/clib2.stdlib_default_pool_size.h.p8
3 files changed, 23 insertions, 14 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index b672b60..5b16afa 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -20,7 +20,7 @@ UPSTREAM_MPC_VERSION := 0.8.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
-UPSTREAM_CLIB2_VERSION := 1_206
+UPSTREAM_CLIB2_VERSION := 1_207
UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz
UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_TARBALL)
diff --git a/m68k-unknown-amigaos/recipes/patches/clib2/clib2.GNUmakefile.68k.p b/m68k-unknown-amigaos/recipes/patches/clib2/clib2.GNUmakefile.68k.p
index c4b26d3..88bfe42 100644
--- a/m68k-unknown-amigaos/recipes/patches/clib2/clib2.GNUmakefile.68k.p
+++ b/m68k-unknown-amigaos/recipes/patches/clib2/clib2.GNUmakefile.68k.p
@@ -1,6 +1,6 @@
---- GNUmakefile.68k 20 Oct 2010 13:50:16 -0000 1.107
-+++ GNUmakefile.68k 24 Dec 2010 05:30:31 -0000
-@@ -24,9 +24,9 @@
+--- GNUmakefile.68k 2016-11-18 16:22:21.000000000 +0000
++++ GNUmakefile.68k 2016-11-18 23:25:54.801998101 +0000
+@@ -24,9 +24,9 @@ MAKE = $(MAKE_COMMAND) -f GNUmakefile.68
# override certain things for non-native builds
ifneq ($(HOST), AmigaOS)
@@ -13,7 +13,15 @@
COPY = cp
DELETE = rm -rf
MAKEDIR = mkdir -p
-@@ -530,6 +530,7 @@
+@@ -326,7 +326,6 @@ C_LIB = \
+ stdlib_dosbase.o \
+ stdlib_exit.o \
+ stdlib_free.o \
+- stdlib_free_unused_slabs.o \
+ stdlib_getdefstacksize.o \
+ stdlib_getenv.o \
+ stdlib_getmemstats.o \
+@@ -533,6 +532,7 @@ UNIX_LIB = \
stdlib_realloc.o \
stdlib_resetmemstats.o \
stdlib_system.o \
@@ -21,7 +29,7 @@
systeminfo_sysinfo.o \
termios_cfgetispeed.o \
termios_cfgetospeed.o \
-@@ -979,10 +980,10 @@
+@@ -982,10 +982,10 @@ all: \
lib/n32bcrt0.o \
lib/n32rcrt0.o \
lib/libm020/libm.a \
@@ -36,3 +44,12 @@
##############################################################################
+@@ -1132,8 +1132,6 @@ $(LIBC_OBJS)/stdlib_malloc.o : stdlib_ma
+
+ $(LIBC_OBJS)/stdlib_slab.o : stdlib_slab.c stdlib_memory.h
+
+-$(LIBC_OBJS)/stdlib_free_unused_slabs.o : stdlib_free_unused_slabs.c stdlib_memory.h
+-
+ $(LIBC_OBJS)/stdlib_realloc.o : stdlib_realloc.c stdlib_memory.h
+
+ $(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_memory.h
diff --git a/m68k-unknown-amigaos/recipes/patches/clib2/clib2.stdlib_default_pool_size.h.p b/m68k-unknown-amigaos/recipes/patches/clib2/clib2.stdlib_default_pool_size.h.p
deleted file mode 100644
index 5e94766..0000000
--- a/m68k-unknown-amigaos/recipes/patches/clib2/clib2.stdlib_default_pool_size.h.p
+++ b/dev/null
@@ -1,8 +0,0 @@
---- builddir/clib2/stdlib_default_pool_size.c 2015-04-24 15:00:24.000000000 +0100
-+++ stdlib_default_pool_size.c 2016-02-27 11:30:52.124018382 +0000
-@@ -37,4 +37,4 @@
-
- /****************************************************************************/
-
--int NOCOMMON __default_pool_size = 4096;
-+int NOCOMMON __default_pool_size = 16384;