[gcc-7] 342/354: * Compress debug symbols for compiler binaries with dwz.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:51:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository gcc-7.
commit 5d55f7f2417a8d899dc0a496e6dbcd9354d98663
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Tue Nov 14 13:29:00 2017 +0000
* Compress debug symbols for compiler binaries with dwz.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9824 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 1 +
debian/control | 2 +-
debian/control.m4 | 4 ++--
debian/rules.d/binary-ada.mk | 4 ++++
debian/rules.d/binary-brig.mk | 4 ++++
debian/rules.d/binary-cpp.mk | 3 +++
debian/rules.d/binary-cxx.mk | 4 ++++
debian/rules.d/binary-d.mk | 4 ++++
debian/rules.d/binary-fortran.mk | 4 ++++
debian/rules.d/binary-gcc.mk | 6 ++++++
debian/rules.d/binary-go.mk | 4 ++++
debian/rules.d/binary-hppa64.mk | 7 +++++++
debian/rules.d/binary-nvptx.mk | 4 ++++
debian/rules.d/binary-objc.mk | 4 ++++
debian/rules.d/binary-objcxx.mk | 4 ++++
debian/rules.d/binary-snapshot.mk | 1 +
16 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ca2bd4f..105f86f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-7 (7.2.0-15) UNRELEASED; urgency=medium
* Fix libgo build on ia64 (Jason Duerstock). Closes: #881372.
* Port libgo to the Hurd (Svante Signell).
+ * Compress debug symbols for compiler binaries with dwz.
-- Matthias Klose <doko at debian.org> Mon, 13 Nov 2017 22:47:12 +0100
diff --git a/debian/control b/debian/control
index 94823d4..4424318 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14),
libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mi [...]
kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k],
m4, libtool, autoconf2.64,
- libunwind8-dev [ia64], libatomic-ops-dev [ia64],
+ dwz, libunwind8-dev [ia64], libatomic-ops-dev [ia64],
gawk, lzma, xz-utils, patchutils,
zlib1g-dev, systemtap-sdt-dev [linux-any kfreebsd-any hurd-any],
binutils:native (>= 2.29.1) | binutils-multiarch:native (>= 2.29.1), binutils-hppa64-linux-gnu:native (>= 2.29.1) [hppa amd64 i386 x32],
diff --git a/debian/control.m4 b/debian/control.m4
index 9a826eb..1de1912 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -61,7 +61,7 @@ ifdef(`TARGET',`dnl cross
Build-Depends: DEBHELPER_BUILD_DEP DPKG_BUILD_DEP
LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP
kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k],
- LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTO_BUILD_DEP
+ dwz, LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTO_BUILD_DEP
SOURCE_BUILD_DEP CROSS_BUILD_DEP
ISL_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP,
zlib1g-dev, gawk, lzma, xz-utils, patchutils,
@@ -74,7 +74,7 @@ Build-Depends: DEBHELPER_BUILD_DEP DPKG_BUILD_DEP
LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBC_DBG_DEP
kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k],
AUTO_BUILD_DEP BASE_BUILD_DEP
- libunwind8-dev [ia64], libatomic-ops-dev [ia64],
+ dwz, libunwind8-dev [ia64], libatomic-ops-dev [ia64],
gawk, lzma, xz-utils, patchutils,
zlib1g-dev, SDT_BUILD_DEP
BINUTILS_BUILD_DEP,
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 170b3b2..47901ad 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -291,6 +291,10 @@ ifeq ($(unprefixed_names),yes)
endif
debian/dh_rmemptydirs -p$(p_gnat)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_gnat)/$(gcc_lexec_dir)/gnat1
+endif
dh_strip -p$(p_gnat)
find $(d_gnat) -name '*.ali' | xargs chmod 444
$(cross_shlibdeps) dh_shlibdeps -p$(p_gnat) \
diff --git a/debian/rules.d/binary-brig.mk b/debian/rules.d/binary-brig.mk
index a59b7df..841be8e 100644
--- a/debian/rules.d/binary-brig.mk
+++ b/debian/rules.d/binary-brig.mk
@@ -51,6 +51,10 @@ endif
debian/dh_rmemptydirs -p$(p_brig)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_brig)/$(gcc_lexec_dir)/brig1
+endif
dh_strip -p$(p_brig) \
$(if $(unstripped_exe),-X/brig1)
dh_shlibdeps -p$(p_brig)
diff --git a/debian/rules.d/binary-cpp.mk b/debian/rules.d/binary-cpp.mk
index 3ebd259..25d6298 100644
--- a/debian/rules.d/binary-cpp.mk
+++ b/debian/rules.d/binary-cpp.mk
@@ -52,6 +52,9 @@ endif
debian/dh_doclink -p$(p_cpp) $(p_xbase)
debian/dh_rmemptydirs -p$(p_cpp)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz $(d_cpp)/$(gcc_lexec_dir)/cc1
+endif
dh_strip -p$(p_cpp) \
$(if $(unstripped_exe),-X/cc1)
dh_shlibdeps -p$(p_cpp)
diff --git a/debian/rules.d/binary-cxx.mk b/debian/rules.d/binary-cxx.mk
index 847249e..215a262 100644
--- a/debian/rules.d/binary-cxx.mk
+++ b/debian/rules.d/binary-cxx.mk
@@ -57,6 +57,10 @@ endif
debian/dh_rmemptydirs -p$(p_cxx)
dh_shlibdeps -p$(p_cxx)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_cxx)/$(gcc_lexec_dir)/cc1plus
+endif
dh_strip -p$(p_cxx) $(if $(unstripped_exe),-X/cc1plus)
echo $(p_cxx) >> debian/arch_binaries
diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk
index ca8817d..430e54d 100644
--- a/debian/rules.d/binary-d.mk
+++ b/debian/rules.d/binary-d.mk
@@ -129,6 +129,10 @@ endif
/$(docdir)/$(p_gcc)/README.Bugs \
/$(docdir)/$(p_gdc)/README.Bugs
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_gdc)/$(gcc_lexec_dir)/cc1d
+endif
dh_strip -p$(p_gdc) \
$(if $(unstripped_exe),-X/cc1d)
dh_shlibdeps -p$(p_gdc)
diff --git a/debian/rules.d/binary-fortran.mk b/debian/rules.d/binary-fortran.mk
index 3c5382e..841e28d 100644
--- a/debian/rules.d/binary-fortran.mk
+++ b/debian/rules.d/binary-fortran.mk
@@ -199,6 +199,10 @@ endif
$(d_g95)/$(docdir)/$(p_xbase)/fortran/changelog
debian/dh_rmemptydirs -p$(p_g95)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_g95)/$(gcc_lexec_dir)/f951
+endif
dh_strip -p$(p_g95) \
$(if $(unstripped_exe),-X/f951)
dh_shlibdeps -p$(p_g95)
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index bb1d655..e769a03 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -188,6 +188,12 @@ ifeq ($(GFDL_INVARIANT_FREE),yes)
endif
debian/dh_rmemptydirs -p$(p_gcc)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_gcc)/$(gcc_lexec_dir)/lto1 \
+ $(d_gcc)/$(gcc_lexec_dir)/lto-wrapper \
+ $(d_gcc)/$(gcc_lexec_dir)/collect2
+endif
dh_strip -p$(p_gcc) \
$(if $(unstripped_exe),-X/lto1)
dh_shlibdeps -p$(p_gcc)
diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk
index 0e60557..3df93e0 100644
--- a/debian/rules.d/binary-go.mk
+++ b/debian/rules.d/binary-go.mk
@@ -282,6 +282,10 @@ endif
# $(d_go)/$(docdir)/$(p_base)/go/changelog
debian/dh_rmemptydirs -p$(p_go)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_go)/$(gcc_lexec_dir)/go1
+endif
dh_strip -v -p$(p_go) -X/cgo -X/go$(pkg_ver) -X/gofmt$(pkg_ver) \
$(if $(unstripped_exe),-X/go1)
dh_shlibdeps -p$(p_go)
diff --git a/debian/rules.d/binary-hppa64.mk b/debian/rules.d/binary-hppa64.mk
index 2dc9b33..118fe63 100644
--- a/debian/rules.d/binary-hppa64.mk
+++ b/debian/rules.d/binary-hppa64.mk
@@ -20,6 +20,13 @@ $(binary_stamp)-hppa64: $(install_hppa64_stamp)
debian/dh_doclink -p$(p_hppa64) $(p_xbase)
debian/dh_rmemptydirs -p$(p_hppa64)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_hppa64)/$(gcc_lexec_dir)/cc1 \
+ $(d_hppa64)/$(gcc_lexec_dir)/collect2 \
+ $(d_hppa64)/$(gcc_lexec_dir)/lto-wrapper \
+ $(d_hppa64)/$(gcc_lexec_dir)/lto1
+endif
dh_strip -p$(p_hppa64) -X.o -Xlibgcc.a -Xlibgcov.a
dh_shlibdeps -p$(p_hppa64)
diff --git a/debian/rules.d/binary-nvptx.mk b/debian/rules.d/binary-nvptx.mk
index 6aadf7b..4a6e6fd 100644
--- a/debian/rules.d/binary-nvptx.mk
+++ b/debian/rules.d/binary-nvptx.mk
@@ -53,6 +53,10 @@ endif
debian/dh_rmemptydirs -p$(p_nvptx)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_nvptx)/$(gcc_lexec_dir)/accel/nvptx-none/{collect2,lto1,lto-wrapper,mkoffload}
+endif
dh_strip -p$(p_nvptx) \
$(if $(unstripped_exe),-X/lto1)
dh_shlibdeps -p$(p_nvptx)
diff --git a/debian/rules.d/binary-objc.mk b/debian/rules.d/binary-objc.mk
index 7b9a494..a310715 100644
--- a/debian/rules.d/binary-objc.mk
+++ b/debian/rules.d/binary-objc.mk
@@ -45,6 +45,10 @@ endif
debian/dh_rmemptydirs -p$(p_objc)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_objc)/$(gcc_lexec_dir)/cc1obj
+endif
dh_strip -p$(p_objc) \
$(if $(unstripped_exe),-X/cc1obj)
dh_shlibdeps -p$(p_objc)
diff --git a/debian/rules.d/binary-objcxx.mk b/debian/rules.d/binary-objcxx.mk
index 20554eb..ec142b1 100644
--- a/debian/rules.d/binary-objcxx.mk
+++ b/debian/rules.d/binary-objcxx.mk
@@ -41,6 +41,10 @@ endif
debian/dh_rmemptydirs -p$(p_objcx)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
+ dwz \
+ $(d_objcx)/$(gcc_lexec_dir)/cc1objplus
+endif
dh_strip -p$(p_objcx) \
$(if $(unstripped_exe),-X/cc1objplus)
dh_shlibdeps -p$(p_objcx)
diff --git a/debian/rules.d/binary-snapshot.mk b/debian/rules.d/binary-snapshot.mk
index dc65fe3..d9b75ce 100644
--- a/debian/rules.d/binary-snapshot.mk
+++ b/debian/rules.d/binary-snapshot.mk
@@ -115,6 +115,7 @@ ifeq ($(DEB_TARGET_ARCH),hppa)
dh_strip -p$(p_snap) -Xdebug -X.o -X.a -X/cgo -Xbin/go -Xbin/gofmt \
$(if $(unstripped_exe),$(foreach i,cc1 cc1obj cc1objplus cc1plus cc1d f951 go1 jc1 lto1, -X/$(i)))
else
+ dh_dwz -p$(p_snap) -Xdebug -X/cgo -Xbin/go -Xbin/gofmt
dh_strip -p$(p_snap) -Xdebug -X/cgo -Xbin/go -Xbin/gofmt \
$(if $(unstripped_exe),$(foreach i,cc1 cc1obj cc1objplus cc1plus cc1d f951 go1 jc1 lto1, -X/$(i)))
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git
More information about the Reproducible-commits
mailing list