diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-12-03 20:23:38 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-12-03 20:23:38 +0000 |
| commit | b6fb4dc7dcb4b6a3dc562a5f145b3b14217d465a (patch) | |
| tree | 4eb3b9d713006301d402c4871c6aa1b140c89935 | |
| parent | 70ca3eb8751bb2d96323bf1528e9c6ce80b0b307 (diff) | |
| parent | 554158c91114fe78ca70ed50255df7cc491240b7 (diff) | |
| download | toolchains-b6fb4dc7dcb4b6a3dc562a5f145b3b14217d465a.tar.gz toolchains-b6fb4dc7dcb4b6a3dc562a5f145b3b14217d465a.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/toolchains into chris/clib2-debug
| -rw-r--r-- | m68k-unknown-amigaos/Makefile | 2 | ||||
| -rw-r--r-- | m68k-unknown-amigaos/recipes/patches/clib2/clib2.GNUmakefile.68k.p | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 5b16afa..e4f8a37 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_207 +UPSTREAM_CLIB2_VERSION := 1_212 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 88bfe42..09bd9d8 100644 --- a/m68k-unknown-amigaos/recipes/patches/clib2/clib2.GNUmakefile.68k.p +++ b/m68k-unknown-amigaos/recipes/patches/clib2/clib2.GNUmakefile.68k.p @@ -13,14 +13,6 @@ COPY = cp DELETE = rm -rf MAKEDIR = mkdir -p -@@ -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 \ @@ -44,12 +36,3 @@ ############################################################################## -@@ -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 |