Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit 3739537

Browse files
ianlancetaylorianlancetaylor
committed
libbacktrace: rebuild configury with GCC standard tool versions
Add required support files to the config subdirectory. Update dtest to be based on a statically linked program.
1 parent 4183d76 commit 3739537

File tree

12 files changed

+9094
-11393
lines changed

12 files changed

+9094
-11393
lines changed

‎Makefile.am

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3030
# POSSIBILITY OF SUCH DAMAGE.
3131

32-
ACLOCAL_AMFLAGS = -I .. -I ../config
32+
ACLOCAL_AMFLAGS = -I config
3333

3434
AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
3535

@@ -84,6 +84,7 @@ libbacktrace_la_DEPENDENCIES = $(libbacktrace_la_LIBADD)
8484
# Testsuite.
8585

8686
check_PROGRAMS =
87+
CLEANFILES =
8788

8889
TESTS = $(check_PROGRAMS)
8990

@@ -95,6 +96,13 @@ btest_LDADD = libbacktrace.la
9596

9697
check_PROGRAMS += btest
9798

99+
btest_static_SOURCES = btest.c testlib.c
100+
btest_static_CFLAGS = $(AM_CFLAGS) -g -O
101+
btest_static_LDADD = libbacktrace.la
102+
btest_static_LDFLAGS = -static-libtool-libs
103+
104+
check_PROGRAMS += btest_static
105+
98106
stest_SOURCES = stest.c
99107
stest_LDADD = libbacktrace.la
100108

@@ -122,6 +130,8 @@ gen_edtest2_build: $(srcdir)/edtest2.c
122130
$(SHELL) $(srcdir)/move-if-change tmp-edtest2_build.c edtest2_build.c
123131
echo timestamp > $@
124132

133+
CLEANFILES += edtest2_build.c gen_edtest2_build
134+
125135
if HAVE_PTHREAD
126136

127137
check_PROGRAMS += ttest
@@ -136,9 +146,11 @@ if HAVE_OBJCOPY_DEBUGLINK
136146

137147
TESTS += dtest
138148

139-
dtest: btest
140-
$(OBJCOPY) --only-keep-debug .libs/btest btest.debug
141-
$(OBJCOPY) --strip-debug --add-gnu-debuglink=btest.debug .libs/btest dtest
149+
dtest: btest_static
150+
$(OBJCOPY) --only-keep-debug btest_static btest.debug
151+
$(OBJCOPY) --strip-debug --add-gnu-debuglink=btest.debug btest_static dtest
152+
153+
CLEANFILES += dtest btest.debug
142154

143155
endif HAVE_OBJCOPY_DEBUGLINK
144156

‎Makefile.in

Lines changed: 50 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,24 @@ build_triplet = @build@
8585
host_triplet = @host@
8686
target_triplet = @target@
8787
check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
88-
@NATIVE_TRUE@am__append_1 = btest stest ztest edtest
88+
@NATIVE_TRUE@am__append_1 = btest btest_static stest ztest edtest
8989
@HAVE_ZLIB_TRUE@@NATIVE_TRUE@am__append_2 = -lz
90-
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__append_3 = ttest
91-
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_4 = dtest
92-
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__append_5 = ctestg ctesta
90+
@NATIVE_TRUE@am__append_3 = edtest2_build.c gen_edtest2_build
91+
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__append_4 = ttest
92+
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_5 = dtest
93+
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_6 = dtest btest.debug
94+
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__append_7 = ctestg ctesta
9395
subdir = .
9496
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
9597
$(top_srcdir)/configure $(am__configure_deps) \
9698
$(srcdir)/config.h.in $(srcdir)/backtrace-supported.h.in \
9799
$(include_HEADERS)
98100
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
99-
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
101+
am__aclocal_m4_deps = $(top_srcdir)/config/libtool.m4 \
102+
$(top_srcdir)/config/ltoptions.m4 \
103+
$(top_srcdir)/config/ltsugar.m4 \
104+
$(top_srcdir)/config/ltversion.m4 \
105+
$(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
100106
$(top_srcdir)/configure.ac
101107
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
102108
$(ACLOCAL_M4)
@@ -139,8 +145,8 @@ am__DEPENDENCIES_1 =
139145
am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \
140146
print.lo sort.lo state.lo
141147
libbacktrace_la_OBJECTS = $(am_libbacktrace_la_OBJECTS)
142-
@NATIVE_TRUE@am__EXEEXT_1 = btest$(EXEEXT) stest$(EXEEXT) \
143-
@NATIVE_TRUE@ ztest$(EXEEXT) edtest$(EXEEXT)
148+
@NATIVE_TRUE@am__EXEEXT_1 = btest$(EXEEXT) btest_static$(EXEEXT) \
149+
@NATIVE_TRUE@ stest$(EXEEXT) ztest$(EXEEXT) edtest$(EXEEXT)
144150
@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = ttest$(EXEEXT)
145151
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = \
146152
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctestg$(EXEEXT) \
@@ -152,6 +158,13 @@ btest_OBJECTS = $(am_btest_OBJECTS)
152158
btest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
153159
--mode=link $(CCLD) $(btest_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
154160
$(LDFLAGS) -o $@
161+
@NATIVE_TRUE@am_btest_static_OBJECTS = btest_static-btest.$(OBJEXT) \
162+
@NATIVE_TRUE@ btest_static-testlib.$(OBJEXT)
163+
btest_static_OBJECTS = $(am_btest_static_OBJECTS)
164+
@NATIVE_TRUE@btest_static_DEPENDENCIES = libbacktrace.la
165+
btest_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
166+
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(btest_static_CFLAGS) \
167+
$(CFLAGS) $(btest_static_LDFLAGS) $(LDFLAGS) -o $@
155168
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am_ctesta_OBJECTS = ctesta-btest.$(OBJEXT) \
156169
@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ ctesta-testlib.$(OBJEXT)
157170
ctesta_OBJECTS = $(am_ctesta_OBJECTS)
@@ -204,9 +217,9 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
204217
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
205218
$(LDFLAGS) -o $@
206219
SOURCES = $(libbacktrace_la_SOURCES) $(EXTRA_libbacktrace_la_SOURCES) \
207-
$(btest_SOURCES) $(ctesta_SOURCES) $(ctestg_SOURCES) \
208-
$(edtest_SOURCES) $(stest_SOURCES) $(ttest_SOURCES) \
209-
$(ztest_SOURCES)
220+
$(btest_SOURCES) $(btest_static_SOURCES) $(ctesta_SOURCES) \
221+
$(ctestg_SOURCES) $(edtest_SOURCES) $(stest_SOURCES) \
222+
$(ttest_SOURCES) $(ztest_SOURCES)
210223
MULTISRCTOP =
211224
MULTIBUILDTOP =
212225
MULTIDIRS =
@@ -273,7 +286,6 @@ MKDIR_P = @MKDIR_P@
273286
NM = @NM@
274287
NMEDIT = @NMEDIT@
275288
OBJCOPY = @OBJCOPY@
276-
OBJDUMP = @OBJDUMP@
277289
OBJEXT = @OBJEXT@
278290
OTOOL = @OTOOL@
279291
OTOOL64 = @OTOOL64@
@@ -330,6 +342,7 @@ libexecdir = @libexecdir@
330342
libtool_VERSION = @libtool_VERSION@
331343
localedir = @localedir@
332344
localstatedir = @localstatedir@
345+
lt_ECHO = @lt_ECHO@
333346
mandir = @mandir@
334347
mkdir_p = @mkdir_p@
335348
multi_basedir = @multi_basedir@
@@ -338,7 +351,6 @@ pdfdir = @pdfdir@
338351
prefix = @prefix@
339352
program_transform_name = @program_transform_name@
340353
psdir = @psdir@
341-
runstatedir = @runstatedir@
342354
sbindir = @sbindir@
343355
sharedstatedir = @sharedstatedir@
344356
srcdir = @srcdir@
@@ -351,7 +363,7 @@ target_vendor = @target_vendor@
351363
top_build_prefix = @top_build_prefix@
352364
top_builddir = @top_builddir@
353365
top_srcdir = @top_srcdir@
354-
ACLOCAL_AMFLAGS = -I .. -I ../config
366+
ACLOCAL_AMFLAGS = -I config
355367
AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
356368
include_HEADERS = backtrace.h backtrace-supported.h
357369
lib_LTLIBRARIES = libbacktrace.la
@@ -398,10 +410,15 @@ libbacktrace_la_LIBADD = \
398410
$(ALLOC_FILE)
399411

400412
libbacktrace_la_DEPENDENCIES = $(libbacktrace_la_LIBADD)
401-
TESTS = $(check_PROGRAMS) $(am__append_4)
413+
CLEANFILES = $(am__append_3) $(am__append_6)
414+
TESTS = $(check_PROGRAMS) $(am__append_5)
402415
@NATIVE_TRUE@btest_SOURCES = btest.c testlib.c
403416
@NATIVE_TRUE@btest_CFLAGS = $(AM_CFLAGS) -g -O
404417
@NATIVE_TRUE@btest_LDADD = libbacktrace.la
418+
@NATIVE_TRUE@btest_static_SOURCES = btest.c testlib.c
419+
@NATIVE_TRUE@btest_static_CFLAGS = $(AM_CFLAGS) -g -O
420+
@NATIVE_TRUE@btest_static_LDADD = libbacktrace.la
421+
@NATIVE_TRUE@btest_static_LDFLAGS = -static-libtool-libs
405422
@NATIVE_TRUE@stest_SOURCES = stest.c
406423
@NATIVE_TRUE@stest_LDADD = libbacktrace.la
407424
@NATIVE_TRUE@ztest_SOURCES = ztest.c testlib.c
@@ -523,6 +540,9 @@ clean-checkPROGRAMS:
523540
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES)
524541
@rm -f btest$(EXEEXT)
525542
$(btest_LINK) $(btest_OBJECTS) $(btest_LDADD) $(LIBS)
543+
btest_static$(EXEEXT): $(btest_static_OBJECTS) $(btest_static_DEPENDENCIES) $(EXTRA_btest_static_DEPENDENCIES)
544+
@rm -f btest_static$(EXEEXT)
545+
$(btest_static_LINK) $(btest_static_OBJECTS) $(btest_static_LDADD) $(LIBS)
526546
ctesta$(EXEEXT): $(ctesta_OBJECTS) $(ctesta_DEPENDENCIES) $(EXTRA_ctesta_DEPENDENCIES)
527547
@rm -f ctesta$(EXEEXT)
528548
$(ctesta_LINK) $(ctesta_OBJECTS) $(ctesta_LDADD) $(LIBS)
@@ -569,6 +589,18 @@ btest-testlib.o: testlib.c
569589
btest-testlib.obj: testlib.c
570590
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_CFLAGS) $(CFLAGS) -c -o btest-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
571591

592+
btest_static-btest.o: btest.c
593+
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_static_CFLAGS) $(CFLAGS) -c -o btest_static-btest.o `test -f 'btest.c' || echo '$(srcdir)/'`btest.c
594+
595+
btest_static-btest.obj: btest.c
596+
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_static_CFLAGS) $(CFLAGS) -c -o btest_static-btest.obj `if test -f 'btest.c'; then $(CYGPATH_W) 'btest.c'; else $(CYGPATH_W) '$(srcdir)/btest.c'; fi`
597+
598+
btest_static-testlib.o: testlib.c
599+
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_static_CFLAGS) $(CFLAGS) -c -o btest_static-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
600+
601+
btest_static-testlib.obj: testlib.c
602+
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_static_CFLAGS) $(CFLAGS) -c -o btest_static-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
603+
572604
ctesta-btest.o: btest.c
573605
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctesta_CFLAGS) $(CFLAGS) -c -o ctesta-btest.o `test -f 'btest.c' || echo '$(srcdir)/'`btest.c
574606

@@ -839,6 +871,7 @@ install-strip:
839871
mostlyclean-generic:
840872

841873
clean-generic:
874+
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
842875

843876
distclean-generic:
844877
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -947,9 +980,9 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
947980
@NATIVE_TRUE@ $(SHELL) $(srcdir)/move-if-change tmp-edtest2_build.c edtest2_build.c
948981
@NATIVE_TRUE@ echo timestamp > $@
949982

950-
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@dtest: btest
951-
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(OBJCOPY) --only-keep-debug .libs/btest btest.debug
952-
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(OBJCOPY) --strip-debug --add-gnu-debuglink=btest.debug .libs/btest dtest
983+
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@dtest: btest_static
984+
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(OBJCOPY) --only-keep-debug btest_static btest.debug
985+
@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(OBJCOPY) --strip-debug --add-gnu-debuglink=btest.debug btest_static dtest
953986

954987
# We can't use automake's automatic dependency tracking, because it
955988
# breaks when using bootstrap-lean. Automatic dependency tracking

0 commit comments

Comments
 (0)