Use RTEMS provides zlib

This commit is contained in:
Sebastian Huber
2013-10-24 08:54:58 +02:00
parent facf9dcea6
commit 87fdc14286
5 changed files with 11 additions and 6440 deletions

View File

@@ -198,7 +198,6 @@ LIB_C_FILES += freebsd/sys/net/raw_usrreq.c
LIB_C_FILES += freebsd/sys/net/route.c
LIB_C_FILES += freebsd/sys/net/rtsock.c
LIB_C_FILES += freebsd/sys/net/slcompress.c
LIB_C_FILES += freebsd/sys/net/zlib.c
LIB_C_FILES += freebsd/sys/net/bpf_buffer.c
LIB_C_FILES += freebsd/sys/net/bpf.c
LIB_C_FILES += freebsd/sys/net/bpf_filter.c
@@ -785,7 +784,7 @@ TEST_SLEEP01_D_FILES =
TEST_SLEEP01_O_FILES += testsuite/sleep01/test_main.o
TEST_SLEEP01_D_FILES += testsuite/sleep01/test_main.d
$(TEST_SLEEP01): $(TEST_SLEEP01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/sleep01/sleep01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/sleep01/sleep01.map $^ -lm -lz -o $@
TESTS += $(TEST_SLEEP01)
O_FILES += $(TEST_SLEEP01_O_FILES)
D_FILES += $(TEST_SLEEP01_D_FILES)
@@ -797,7 +796,7 @@ TEST_SYSCALLS01_D_FILES =
TEST_SYSCALLS01_O_FILES += testsuite/syscalls01/test_main.o
TEST_SYSCALLS01_D_FILES += testsuite/syscalls01/test_main.d
$(TEST_SYSCALLS01): $(TEST_SYSCALLS01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/syscalls01/syscalls01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/syscalls01/syscalls01.map $^ -lm -lz -o $@
TESTS += $(TEST_SYSCALLS01)
O_FILES += $(TEST_SYSCALLS01_O_FILES)
D_FILES += $(TEST_SYSCALLS01_D_FILES)
@@ -823,7 +822,7 @@ TEST_USB01_D_FILES += testsuite/usb01/init.d
TEST_USB01_O_FILES += testsuite/usb01/test-file-system.o
TEST_USB01_D_FILES += testsuite/usb01/test-file-system.d
$(TEST_USB01): $(TEST_USB01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/usb01/usb01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/usb01/usb01.map $^ -lm -lz -o $@
TESTS += $(TEST_USB01)
O_FILES += $(TEST_USB01_O_FILES)
D_FILES += $(TEST_USB01_D_FILES)
@@ -834,7 +833,7 @@ TEST_LOOPBACK01_D_FILES =
TEST_LOOPBACK01_O_FILES += testsuite/loopback01/test_main.o
TEST_LOOPBACK01_D_FILES += testsuite/loopback01/test_main.d
$(TEST_LOOPBACK01): $(TEST_LOOPBACK01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/loopback01/loopback01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/loopback01/loopback01.map $^ -lm -lz -o $@
TESTS += $(TEST_LOOPBACK01)
O_FILES += $(TEST_LOOPBACK01_O_FILES)
D_FILES += $(TEST_LOOPBACK01_D_FILES)
@@ -850,7 +849,7 @@ TEST_NETSHELL01_D_FILES += testsuite/netshell01/shellconfig.d
TEST_NETSHELL01_O_FILES += testsuite/netshell01/ns_parser_vars.o
TEST_NETSHELL01_D_FILES += testsuite/netshell01/ns_parser_vars.d
$(TEST_NETSHELL01): $(TEST_NETSHELL01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/netshell01/netshell01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/netshell01/netshell01.map $^ -lm -lz -o $@
TESTS += $(TEST_NETSHELL01)
O_FILES += $(TEST_NETSHELL01_O_FILES)
D_FILES += $(TEST_NETSHELL01_D_FILES)
@@ -863,7 +862,7 @@ TEST_SWI01_D_FILES += testsuite/swi01/init.d
TEST_SWI01_O_FILES += testsuite/swi01/swi_test.o
TEST_SWI01_D_FILES += testsuite/swi01/swi_test.d
$(TEST_SWI01): $(TEST_SWI01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/swi01/swi01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/swi01/swi01.map $^ -lm -lz -o $@
TESTS += $(TEST_SWI01)
O_FILES += $(TEST_SWI01_O_FILES)
D_FILES += $(TEST_SWI01_D_FILES)
@@ -879,7 +878,7 @@ TEST_TIMEOUT01_D_FILES += testsuite/timeout01/timeout_test.d
TEST_TIMEOUT01_O_FILES += testsuite/timeout01/timeout_helper.o
TEST_TIMEOUT01_D_FILES += testsuite/timeout01/timeout_helper.d
$(TEST_TIMEOUT01): $(TEST_TIMEOUT01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/timeout01/timeout01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/timeout01/timeout01.map $^ -lm -lz -o $@
TESTS += $(TEST_TIMEOUT01)
O_FILES += $(TEST_TIMEOUT01_O_FILES)
D_FILES += $(TEST_TIMEOUT01_D_FILES)
@@ -891,7 +890,7 @@ TEST_INIT01_D_FILES =
TEST_INIT01_O_FILES += testsuite/init01/test_main.o
TEST_INIT01_D_FILES += testsuite/init01/test_main.d
$(TEST_INIT01): $(TEST_INIT01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/init01/init01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/init01/init01.map $^ -lm -lz -o $@
TESTS += $(TEST_INIT01)
O_FILES += $(TEST_INIT01_O_FILES)
D_FILES += $(TEST_INIT01_D_FILES)
@@ -903,7 +902,7 @@ TEST_THREAD01_D_FILES =
TEST_THREAD01_O_FILES += testsuite/thread01/test_main.o
TEST_THREAD01_D_FILES += testsuite/thread01/test_main.d
$(TEST_THREAD01): $(TEST_THREAD01_O_FILES) $(LIB)
$(LINK.c) -Wl,-Map,testsuite/thread01/thread01.map $^ -lm -o $@
$(LINK.c) -Wl,-Map,testsuite/thread01/thread01.map $^ -lm -lz -o $@
TESTS += $(TEST_THREAD01)
O_FILES += $(TEST_THREAD01_O_FILES)
D_FILES += $(TEST_THREAD01_D_FILES)

View File

@@ -318,7 +318,7 @@ class TestMakefileFragementComposer(MakefileFragmentComposer):
makefileFragment = makefileFragment + testOFiles + ' += ' + testDir + '/' + fileFragment + '.o\n' \
+ testDFiles + ' += ' + testDir + '/' + fileFragment + '.d\n'
makefileFragment = makefileFragment + '$(' + testPrefix + '): $(' + testOFiles + ') $(LIB)\n' \
'\t$(LINK.c) -Wl,-Map,' + testMap + ' $^ -lm -o $@\n' \
'\t$(LINK.c) -Wl,-Map,' + testMap + ' $^ -lm -lz -o $@\n' \
'TESTS += $(' + testPrefix + ')\n' \
'O_FILES += $(' + testOFiles + ')\n' \
'D_FILES += $(' + testDFiles + ')\n'
@@ -1426,7 +1426,6 @@ net.addHeaderFiles(
'sys/net/route.h',
'sys/net/slcompress.h',
'sys/net/vnet.h',
'sys/net/zlib.h',
]
)
net.addSourceFiles(
@@ -1468,7 +1467,6 @@ net.addSourceFiles(
'sys/net/route.c',
'sys/net/rtsock.c',
'sys/net/slcompress.c',
'sys/net/zlib.c',
'sys/net/bpf_buffer.c',
'sys/net/bpf.c',
'sys/net/bpf_filter.c',

View File

@@ -0,0 +1 @@
#include <zlib.h>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff