Skip to content

Commit 55c3c45

Browse files
elagergren-spideroakelagergren-spideroak
committed
add VxWorks support
Signed-off-by: Eric Lagergren <[email protected]>
1 parent ad106d5 commit 55c3c45

File tree

9 files changed

+147
-64
lines changed

9 files changed

+147
-64
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
*.lo
44
*.a
55
*.la
6+
7+
autom4te.cache/

‎Makefile.am‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,14 @@
3232
ACLOCAL_AMFLAGS = -I config
3333

3434
AM_CPPFLAGS =
35+
if LIBBACKTRACE_IS_VXWORKS
36+
AM_CPPFLAGS += -mrtp
37+
endif
3538

3639
AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
40+
if LIBBACKTRACE_IS_VXWORKS
41+
AM_CFLAGS += -mrtp
42+
endif
3743

3844
include_HEADERS = backtrace.h backtrace-supported.h
3945

@@ -106,6 +112,9 @@ check_DATA =
106112

107113
# Flags to use when compiling test programs.
108114
libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
115+
if LIBBACKTRACE_IS_VXWORKS
116+
libbacktrace_TEST_CFLAGS += -mrtp
117+
endif
109118

110119
if USE_DSYMUTIL
111120

‎Makefile.in‎

Lines changed: 57 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -121,52 +121,55 @@ POST_UNINSTALL = :
121121
build_triplet = @build@
122122
host_triplet = @host@
123123
target_triplet = @target@
124+
@LIBBACKTRACE_IS_VXWORKS_TRUE@am__append_1 = -mrtp
125+
@LIBBACKTRACE_IS_VXWORKS_TRUE@am__append_2 = -mrtp
124126
check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
125127
$(am__EXEEXT_16)
126-
TESTS = $(am__append_4) $(MAKETESTS) $(am__EXEEXT_16)
127-
@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_1 = libbacktrace_elf_for_test.la
128-
@NATIVE_TRUE@am__append_2 = test_elf_32 test_elf_64 test_macho \
128+
TESTS = $(am__append_7) $(MAKETESTS) $(am__EXEEXT_16)
129+
@LIBBACKTRACE_IS_VXWORKS_TRUE@am__append_3 = -mrtp
130+
@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_4 = libbacktrace_elf_for_test.la
131+
@NATIVE_TRUE@am__append_5 = test_elf_32 test_elf_64 test_macho \
129132
@NATIVE_TRUE@ test_xcoff_32 test_xcoff_64 test_pecoff \
130133
@NATIVE_TRUE@ test_unknown unittest unittest_alloc btest
131-
@NATIVE_TRUE@am__append_3 = allocfail
132-
@NATIVE_TRUE@am__append_4 = allocfail.sh
133-
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_5 = allocfail.dSYM \
134+
@NATIVE_TRUE@am__append_6 = allocfail
135+
@NATIVE_TRUE@am__append_7 = allocfail.sh
136+
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_8 = allocfail.dSYM \
134137
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ btest.dSYM btest_alloc.dSYM \
135138
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ stest.dSYM stest_alloc.dSYM \
136139
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ edtest.dSYM edtest_alloc.dSYM
137-
@HAVE_BUILDID_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_6 = b2test
138-
@HAVE_BUILDID_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_7 = b2test_buildid
139-
@HAVE_BUILDID_TRUE@@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_8 = b3test
140-
@HAVE_BUILDID_TRUE@@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_9 = b3test_dwz_buildid
141-
@HAVE_ELF_TRUE@@NATIVE_TRUE@am__append_10 = btest_lto
142-
@NATIVE_TRUE@am__append_11 = btest_alloc stest stest_alloc
143-
@HAVE_DWZ_TRUE@@NATIVE_TRUE@am__append_12 = btest_dwz
144-
@HAVE_DWZ_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_13 = btest_dwz_gnudebuglink
145-
@HAVE_ELF_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_TRUE@am__append_14 = -lz
146-
@HAVE_ELF_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_TRUE@am__append_15 = -lz
147-
@HAVE_ELF_TRUE@@NATIVE_TRUE@am__append_16 = ztest ztest_alloc zstdtest \
140+
@HAVE_BUILDID_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_9 = b2test
141+
@HAVE_BUILDID_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_10 = b2test_buildid
142+
@HAVE_BUILDID_TRUE@@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_11 = b3test
143+
@HAVE_BUILDID_TRUE@@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_12 = b3test_dwz_buildid
144+
@HAVE_ELF_TRUE@@NATIVE_TRUE@am__append_13 = btest_lto
145+
@NATIVE_TRUE@am__append_14 = btest_alloc stest stest_alloc
146+
@HAVE_DWZ_TRUE@@NATIVE_TRUE@am__append_15 = btest_dwz
147+
@HAVE_DWZ_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_16 = btest_dwz_gnudebuglink
148+
@HAVE_ELF_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_TRUE@am__append_17 = -lz
149+
@HAVE_ELF_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_TRUE@am__append_18 = -lz
150+
@HAVE_ELF_TRUE@@NATIVE_TRUE@am__append_19 = ztest ztest_alloc zstdtest \
148151
@HAVE_ELF_TRUE@@NATIVE_TRUE@ zstdtest_alloc
149-
@HAVE_ELF_TRUE@@HAVE_ZSTD_TRUE@@NATIVE_TRUE@am__append_17 = -lzstd
150-
@HAVE_ELF_TRUE@@HAVE_ZSTD_TRUE@@NATIVE_TRUE@am__append_18 = -lzstd
151-
@NATIVE_TRUE@am__append_19 = edtest edtest_alloc
152-
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__append_20 = ttest ttest_alloc
153-
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_21 = \
152+
@HAVE_ELF_TRUE@@HAVE_ZSTD_TRUE@@NATIVE_TRUE@am__append_20 = -lzstd
153+
@HAVE_ELF_TRUE@@HAVE_ZSTD_TRUE@@NATIVE_TRUE@am__append_21 = -lzstd
154+
@NATIVE_TRUE@am__append_22 = edtest edtest_alloc
155+
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__append_23 = ttest ttest_alloc
156+
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_24 = \
154157
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ ttest.dSYM \
155158
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ ttest_alloc.dSYM
156-
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_22 = btest_gnudebuglink
157-
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__append_23 = ctestg ctesta
158-
@HAVE_COMPRESSED_DEBUG_TRUE@@HAVE_COMPRESSED_DEBUG_ZSTD_TRUE@@NATIVE_TRUE@am__append_24 = ctestzstd
159-
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__append_25 = ctestg_alloc ctesta_alloc
160-
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__append_26 = dwarf5 dwarf5_alloc
161-
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_27 = \
159+
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_25 = btest_gnudebuglink
160+
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__append_26 = ctestg ctesta
161+
@HAVE_COMPRESSED_DEBUG_TRUE@@HAVE_COMPRESSED_DEBUG_ZSTD_TRUE@@NATIVE_TRUE@am__append_27 = ctestzstd
162+
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__append_28 = ctestg_alloc ctesta_alloc
163+
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__append_29 = dwarf5 dwarf5_alloc
164+
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_30 = \
162165
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ dwarf5.dSYM \
163166
@HAVE_DWARF5_TRUE@@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@ dwarf5_alloc.dSYM
164-
@NATIVE_TRUE@am__append_28 = mtest
165-
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_29 = mtest.dSYM
166-
@HAVE_MINIDEBUG_TRUE@@NATIVE_TRUE@am__append_30 = mtest_minidebug
167-
@HAVE_ELF_TRUE@@HAVE_LIBLZMA_TRUE@am__append_31 = -llzma
168-
@HAVE_ELF_TRUE@@HAVE_LIBLZMA_TRUE@am__append_32 = -llzma
169-
@HAVE_ELF_TRUE@am__append_33 = xztest xztest_alloc
167+
@NATIVE_TRUE@am__append_31 = mtest
168+
@NATIVE_TRUE@@USE_DSYMUTIL_TRUE@am__append_32 = mtest.dSYM
169+
@HAVE_MINIDEBUG_TRUE@@NATIVE_TRUE@am__append_33 = mtest_minidebug
170+
@HAVE_ELF_TRUE@@HAVE_LIBLZMA_TRUE@am__append_34 = -llzma
171+
@HAVE_ELF_TRUE@@HAVE_LIBLZMA_TRUE@am__append_35 = -llzma
172+
@HAVE_ELF_TRUE@am__append_36 = xztest xztest_alloc
170173
subdir = .
171174
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
172175
am__aclocal_m4_deps = $(top_srcdir)/config/lead-dot.m4 \
@@ -961,6 +964,7 @@ pdfdir = @pdfdir@
961964
prefix = @prefix@
962965
program_transform_name = @program_transform_name@
963966
psdir = @psdir@
967+
runstatedir = @runstatedir@
964968
sbindir = @sbindir@
965969
sharedstatedir = @sharedstatedir@
966970
srcdir = @srcdir@
@@ -974,8 +978,8 @@ top_build_prefix = @top_build_prefix@
974978
top_builddir = @top_builddir@
975979
top_srcdir = @top_srcdir@
976980
ACLOCAL_AMFLAGS = -I config
977-
AM_CPPFLAGS =
978-
AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
981+
AM_CPPFLAGS = $(am__append_1)
982+
AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) $(am__append_2)
979983
include_HEADERS = backtrace.h backtrace-supported.h
980984
lib_LTLIBRARIES = libbacktrace.la
981985
libbacktrace_la_SOURCES = \
@@ -1025,24 +1029,25 @@ libbacktrace_la_DEPENDENCIES = $(libbacktrace_la_LIBADD)
10251029

10261030
# Add a test to this variable if you want it to be built as a Makefile
10271031
# target and run.
1028-
MAKETESTS = $(am__append_7) $(am__append_9) $(am__append_12) \
1029-
$(am__append_13) $(am__append_22) $(am__append_30)
1032+
MAKETESTS = $(am__append_10) $(am__append_12) $(am__append_15) \
1033+
$(am__append_16) $(am__append_25) $(am__append_33)
10301034

10311035
# Add a test to this variable if you want it to be built as a program,
10321036
# with SOURCES, etc., and run.
1033-
BUILDTESTS = $(am__append_2) $(am__append_10) $(am__append_11) \
1034-
$(am__append_16) $(am__append_19) $(am__append_20) \
1035-
$(am__append_23) $(am__append_24) $(am__append_25) \
1036-
$(am__append_26) $(am__append_28) $(am__append_33)
1037+
BUILDTESTS = $(am__append_5) $(am__append_13) $(am__append_14) \
1038+
$(am__append_19) $(am__append_22) $(am__append_23) \
1039+
$(am__append_26) $(am__append_27) $(am__append_28) \
1040+
$(am__append_29) $(am__append_31) $(am__append_36)
10371041

10381042
# Add a file to this variable if you want it to be built for testing.
1039-
check_DATA = $(am__append_5) $(am__append_21) $(am__append_27) \
1040-
$(am__append_29)
1043+
check_DATA = $(am__append_8) $(am__append_24) $(am__append_30) \
1044+
$(am__append_32)
10411045

10421046
# Flags to use when compiling test programs.
1043-
libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
1047+
libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g \
1048+
$(am__append_3)
10441049
@NATIVE_TRUE@check_LTLIBRARIES = libbacktrace_alloc.la \
1045-
@NATIVE_TRUE@ libbacktrace_noformat.la $(am__append_1) \
1050+
@NATIVE_TRUE@ libbacktrace_noformat.la $(am__append_4) \
10461051
@NATIVE_TRUE@ libbacktrace_instrumented_alloc.la
10471052
@NATIVE_TRUE@libbacktrace_alloc_la_SOURCES = $(libbacktrace_la_SOURCES)
10481053
@NATIVE_TRUE@libbacktrace_alloc_la_LIBADD = $(BACKTRACE_FILE) $(FORMAT_FILE) read.lo alloc.lo
@@ -1118,21 +1123,21 @@ libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
11181123
@HAVE_ELF_TRUE@@NATIVE_TRUE@ztest_SOURCES = ztest.c testlib.c
11191124
@HAVE_ELF_TRUE@@NATIVE_TRUE@ztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\"
11201125
@HAVE_ELF_TRUE@@NATIVE_TRUE@ztest_LDADD = libbacktrace.la \
1121-
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(am__append_14) \
1126+
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(am__append_17) \
11221127
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(CLOCK_GETTIME_LINK)
11231128
@HAVE_ELF_TRUE@@NATIVE_TRUE@ztest_alloc_LDADD = libbacktrace_alloc.la \
1124-
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(am__append_15) \
1129+
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(am__append_18) \
11251130
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(CLOCK_GETTIME_LINK)
11261131
@HAVE_ELF_TRUE@@NATIVE_TRUE@ztest_alloc_SOURCES = $(ztest_SOURCES)
11271132
@HAVE_ELF_TRUE@@NATIVE_TRUE@ztest_alloc_CFLAGS = $(ztest_CFLAGS)
11281133
@HAVE_ELF_TRUE@@NATIVE_TRUE@zstdtest_SOURCES = zstdtest.c testlib.c
11291134
@HAVE_ELF_TRUE@@NATIVE_TRUE@zstdtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\"
11301135
@HAVE_ELF_TRUE@@NATIVE_TRUE@zstdtest_LDADD = libbacktrace.la \
1131-
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(am__append_17) \
1136+
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(am__append_20) \
11321137
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(CLOCK_GETTIME_LINK)
11331138
@HAVE_ELF_TRUE@@NATIVE_TRUE@zstdtest_alloc_LDADD = \
11341139
@HAVE_ELF_TRUE@@NATIVE_TRUE@ libbacktrace_alloc.la \
1135-
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(am__append_18) \
1140+
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(am__append_21) \
11361141
@HAVE_ELF_TRUE@@NATIVE_TRUE@ $(CLOCK_GETTIME_LINK)
11371142
@HAVE_ELF_TRUE@@NATIVE_TRUE@zstdtest_alloc_SOURCES = $(zstdtest_SOURCES)
11381143
@HAVE_ELF_TRUE@@NATIVE_TRUE@zstdtest_alloc_CFLAGS = $(zstdtest_CFLAGS)
@@ -1179,12 +1184,12 @@ libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
11791184
@NATIVE_TRUE@mtest_LDADD = libbacktrace.la
11801185
@HAVE_ELF_TRUE@xztest_SOURCES = xztest.c testlib.c
11811186
@HAVE_ELF_TRUE@xztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\"
1182-
@HAVE_ELF_TRUE@xztest_LDADD = libbacktrace.la $(am__append_31) \
1187+
@HAVE_ELF_TRUE@xztest_LDADD = libbacktrace.la $(am__append_34) \
11831188
@HAVE_ELF_TRUE@ $(CLOCK_GETTIME_LINK)
11841189
@HAVE_ELF_TRUE@xztest_alloc_SOURCES = $(xztest_SOURCES)
11851190
@HAVE_ELF_TRUE@xztest_alloc_CFLAGS = $(xztest_CFLAGS)
11861191
@HAVE_ELF_TRUE@xztest_alloc_LDADD = libbacktrace_alloc.la \
1187-
@HAVE_ELF_TRUE@ $(am__append_32) $(CLOCK_GETTIME_LINK)
1192+
@HAVE_ELF_TRUE@ $(am__append_35) $(CLOCK_GETTIME_LINK)
11881193
CLEANFILES = \
11891194
$(MAKETESTS) $(BUILDTESTS) *.debug elf_for_test.c edtest2_build.c \
11901195
gen_edtest2_build \

‎config.h.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
don't. */
2121
#undef HAVE_DECL_STRNLEN
2222

23+
/* Define to 1 if you have the declaration of `sysconf', and to 0 if you
24+
don't. */
25+
#undef HAVE_DECL_SYSCONF
26+
2327
/* Define to 1 if you have the <dlfcn.h> header file. */
2428
#undef HAVE_DLFCN_H
2529

0 commit comments

Comments
 (0)