Skip to content

Commit 3eec885

Browse files
committed
---
yaml --- r: 231758 b: refs/heads/auto c: 48615a6 h: refs/heads/master v: v3
1 parent 27776b8 commit 3eec885

File tree

48 files changed

+226
-1439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+226
-1439
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 9d1f8200e70ade40c12a095c763041bd4cfa9f21
11+
refs/heads/auto: 48615a68fb01d09749a5b73816d45e0d0669d1f9
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/mk/rt.mk

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,8 @@ BACKTRACE_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),backtrace)
259259
BACKTRACE_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(BACKTRACE_NAME_$(1))
260260
BACKTRACE_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/libbacktrace
261261

262-
# We don't use this on platforms that aren't linux-based (with the exception of
263-
# msys2/mingw builds on windows, which use it to read the dwarf debug
264-
# information) so just make the file available, the compilation of libstd won't
265-
# actually build it.
262+
# We don't use this on platforms that aren't linux-based, so just make the file
263+
# available, the compilation of libstd won't actually build it.
266264
ifeq ($$(findstring darwin,$$(OSTYPE_$(1))),darwin)
267265
# See comment above
268266
$$(BACKTRACE_LIB_$(1)):
@@ -275,7 +273,7 @@ $$(BACKTRACE_LIB_$(1)):
275273
touch $$@
276274
else
277275

278-
ifeq ($$(findstring msvc,$(1)),msvc)
276+
ifeq ($$(CFG_WINDOWSY_$(1)),1)
279277
# See comment above
280278
$$(BACKTRACE_LIB_$(1)):
281279
touch $$@
@@ -298,25 +296,16 @@ endif
298296
# ./configure script. This is done to force libbacktrace to *not* use the
299297
# atomic/sync functionality because it pulls in unnecessary dependencies and we
300298
# never use it anyway.
301-
#
302-
# We also use `env PWD=` to clear the PWD environment variable, and then
303-
# execute the command in a new shell. This is necessary to workaround a
304-
# buildbot/msys2 bug: the shell is launched with PWD set to a windows-style path,
305-
# which results in all further uses of `pwd` also printing a windows-style path,
306-
# which breaks libbacktrace's configure script. Clearing PWD within the same
307-
# shell is not sufficient.
308-
309299
$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: $$(BACKTRACE_DEPS) $$(MKFILE_DEPS)
310300
@$$(call E, configure: libbacktrace for $(1))
311301
$$(Q)rm -rf $$(BACKTRACE_BUILD_DIR_$(1))
312302
$$(Q)mkdir -p $$(BACKTRACE_BUILD_DIR_$(1))
313-
$$(Q)(cd $$(BACKTRACE_BUILD_DIR_$(1)) && env \
314-
PWD= \
303+
$$(Q)(cd $$(BACKTRACE_BUILD_DIR_$(1)) && \
315304
CC="$$(CC_$(1))" \
316305
AR="$$(AR_$(1))" \
317306
RANLIB="$$(AR_$(1)) s" \
318307
CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) -fno-stack-protector" \
319-
$(S)src/libbacktrace/configure --build=$(CFG_GNU_TRIPLE_$(CFG_BUILD)) --host=$(CFG_GNU_TRIPLE_$(1)))
308+
$(S)src/libbacktrace/configure --target=$(1) --host=$(CFG_BUILD))
320309
$$(Q)echo '#undef HAVE_ATOMIC_FUNCTIONS' >> \
321310
$$(BACKTRACE_BUILD_DIR_$(1))/config.h
322311
$$(Q)echo '#undef HAVE_SYNC_FUNCTIONS' >> \
@@ -328,7 +317,7 @@ $$(BACKTRACE_LIB_$(1)): $$(BACKTRACE_BUILD_DIR_$(1))/Makefile $$(MKFILE_DEPS)
328317
INCDIR=$(S)src/libbacktrace
329318
$$(Q)cp $$(BACKTRACE_BUILD_DIR_$(1))/.libs/libbacktrace.a $$@
330319

331-
endif # endif for msvc
320+
endif # endif for windowsy
332321
endif # endif for ios
333322
endif # endif for darwin
334323

branches/auto/src/libbacktrace/ChangeLog

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,3 @@
1-
2015-08-24 Ulrich Weigand <[email protected]>
2-
3-
* configure.ac: Set have_mmap to no on spu-*-* targets.
4-
* configure: Regenerate.
5-
6-
2015-08-13 Ian Lance Taylor <[email protected]>
7-
8-
* dwarf.c (read_function_entry): Add vec_inlined parameter.
9-
Change all callers.
10-
11-
2015-06-11 Martin Sebor <[email protected]>
12-
13-
PR sanitizer/65479
14-
* dwarf.c (struct line): Add new field idx.
15-
(line_compare): Use it.
16-
(add_line): Set it.
17-
(read_line_info): Reset it.
18-
19-
2015-05-29 Tristan Gingold <[email protected]>
20-
21-
* pecoff.c: New file.
22-
* Makefile.am (FORMAT_FILES): Add pecoff.c and dependencies.
23-
* Makefile.in: Regenerate.
24-
* filetype.awk: Detect pecoff.
25-
* configure.ac: Define BACKTRACE_SUPPORTS_DATA on elf platforms.
26-
Add pecoff.
27-
* btest.c (test5): Test enabled only if BACKTRACE_SUPPORTS_DATA is
28-
true.
29-
* backtrace-supported.h.in (BACKTRACE_SUPPORTS_DATA): Define.
30-
* configure: Regenerate.
31-
* pecoff.c: New file.
32-
33-
2015-05-13 Michael Haubenwallner <[email protected]>
34-
35-
* Makefile.in: Regenerated with automake-1.11.6.
36-
* aclocal.m4: Likewise.
37-
* configure: Likewise.
38-
391
2015-01-24 Matthias Klose <[email protected]>
402

413
* configure.ac: Move AM_ENABLE_MULTILIB before AC_PROG_CC.

branches/auto/src/libbacktrace/Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ BACKTRACE_FILES = \
5656

5757
FORMAT_FILES = \
5858
elf.c \
59-
pecoff.c \
6059
unknown.c
6160

6261
VIEW_FILES = \
@@ -125,7 +124,6 @@ fileline.lo: config.h backtrace.h internal.h
125124
mmap.lo: config.h backtrace.h internal.h
126125
mmapio.lo: config.h backtrace.h internal.h
127126
nounwind.lo: config.h internal.h
128-
pecoff.lo: config.h backtrace.h internal.h
129127
posix.lo: config.h backtrace.h internal.h
130128
print.lo: config.h backtrace.h internal.h
131129
read.lo: config.h backtrace.h internal.h

branches/auto/src/libbacktrace/Makefile.in

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Makefile.in generated by automake 1.11.6 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.1 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6-
# Foundation, Inc.
5+
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6+
# Inc.
77
# This Makefile.in is free software; the Free Software Foundation
88
# gives unlimited permission to copy and/or distribute it,
99
# with or without modifications, as long as this notice is preserved.
@@ -16,7 +16,7 @@
1616
@SET_MAKE@
1717

1818
# Makefile.am -- Backtrace Makefile.
19-
# Copyright (C) 2012-2015 Free Software Foundation, Inc.
19+
# Copyright (C) 2012-2014 Free Software Foundation, Inc.
2020

2121
# Redistribution and use in source and binary forms, with or without
2222
# modification, are permitted provided that the following conditions are
@@ -47,23 +47,6 @@
4747
# POSSIBILITY OF SUCH DAMAGE.
4848

4949
VPATH = @srcdir@
50-
am__make_dryrun = \
51-
{ \
52-
am__dry=no; \
53-
case $$MAKEFLAGS in \
54-
*\\[\ \ ]*) \
55-
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
56-
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
57-
*) \
58-
for am__flg in $$MAKEFLAGS; do \
59-
case $$am__flg in \
60-
*=*|--*) ;; \
61-
*n*) am__dry=yes; break;; \
62-
esac; \
63-
done;; \
64-
esac; \
65-
test $$am__dry = yes; \
66-
}
6750
pkgdatadir = $(datadir)/@PACKAGE@
6851
pkgincludedir = $(includedir)/@PACKAGE@
6952
pkglibdir = $(libdir)/@PACKAGE@
@@ -143,11 +126,6 @@ MULTIDIRS =
143126
MULTISUBDIR =
144127
MULTIDO = true
145128
MULTICLEAN = true
146-
am__can_run_installinfo = \
147-
case $$AM_UPDATE_INFO_DIR in \
148-
n|no|NO) false;; \
149-
*) (install-info --version) >/dev/null 2>&1;; \
150-
esac
151129
ETAGS = etags
152130
CTAGS = ctags
153131
am__tty_colors = \
@@ -299,7 +277,6 @@ BACKTRACE_FILES = \
299277

300278
FORMAT_FILES = \
301279
elf.c \
302-
pecoff.c \
303280
unknown.c
304281

305282
VIEW_FILES = \
@@ -347,7 +324,7 @@ all: config.h
347324

348325
.SUFFIXES:
349326
.SUFFIXES: .c .lo .o .obj
350-
am--refresh: Makefile
327+
am--refresh:
351328
@:
352329
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
353330
@for dep in $?; do \
@@ -383,8 +360,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
383360
$(am__aclocal_m4_deps):
384361

385362
config.h: stamp-h1
386-
@if test ! -f $@; then rm -f stamp-h1; else :; fi
387-
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
363+
@if test ! -f $@; then \
364+
rm -f stamp-h1; \
365+
$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
366+
else :; fi
388367

389368
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
390369
@rm -f stamp-h1
@@ -407,7 +386,7 @@ clean-noinstLTLIBRARIES:
407386
echo "rm -f \"$${dir}/so_locations\""; \
408387
rm -f "$${dir}/so_locations"; \
409388
done
410-
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES)
389+
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES)
411390
$(LINK) $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
412391

413392
clean-checkPROGRAMS:
@@ -418,10 +397,10 @@ clean-checkPROGRAMS:
418397
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
419398
echo " rm -f" $$list; \
420399
rm -f $$list
421-
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES)
400+
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES)
422401
@rm -f btest$(EXEEXT)
423402
$(btest_LINK) $(btest_OBJECTS) $(btest_LDADD) $(LIBS)
424-
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES)
403+
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES)
425404
@rm -f stest$(EXEEXT)
426405
$(LINK) $(stest_OBJECTS) $(stest_LDADD) $(LIBS)
427406

@@ -605,15 +584,14 @@ check-TESTS: $(TESTS)
605584
fi; \
606585
dashes=`echo "$$dashes" | sed s/./=/g`; \
607586
if test "$$failed" -eq 0; then \
608-
col="$$grn"; \
587+
echo "$$grn$$dashes"; \
609588
else \
610-
col="$$red"; \
589+
echo "$$red$$dashes"; \
611590
fi; \
612-
echo "$${col}$$dashes$${std}"; \
613-
echo "$${col}$$banner$${std}"; \
614-
test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
615-
test -z "$$report" || echo "$${col}$$report$${std}"; \
616-
echo "$${col}$$dashes$${std}"; \
591+
echo "$$banner"; \
592+
test -z "$$skipped" || echo "$$skipped"; \
593+
test -z "$$report" || echo "$$report"; \
594+
echo "$$dashes$$std"; \
617595
test "$$failed" -eq 0; \
618596
else :; fi
619597
check-am: all-am
@@ -632,15 +610,10 @@ install-am: all-am
632610

633611
installcheck: installcheck-am
634612
install-strip:
635-
if test -z '$(STRIP)'; then \
636-
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
637-
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
638-
install; \
639-
else \
640-
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
641-
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
642-
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
643-
fi
613+
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
614+
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
615+
`test -z '$(STRIP)' || \
616+
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
644617
mostlyclean-generic:
645618

646619
clean-generic:
@@ -754,7 +727,6 @@ fileline.lo: config.h backtrace.h internal.h
754727
mmap.lo: config.h backtrace.h internal.h
755728
mmapio.lo: config.h backtrace.h internal.h
756729
nounwind.lo: config.h internal.h
757-
pecoff.lo: config.h backtrace.h internal.h
758730
posix.lo: config.h backtrace.h internal.h
759731
print.lo: config.h backtrace.h internal.h
760732
read.lo: config.h backtrace.h internal.h

0 commit comments

Comments
 (0)