[gcc-6] 329/401: * Configure libphobos builds with --with-target-system-zlib. * Stop applying PR c++/77379.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:50:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.
commit c0209dccacff5bd96d814108b7c2fb75ff6e77fc
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Thu Dec 29 03:25:12 2016 +0000
* Configure libphobos builds with --with-target-system-zlib.
* Stop applying PR c++/77379.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9200 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 2 +
debian/patches/libphobos-zlib.diff | 4 +-
debian/patches/pr77379.diff | 173 -------------------------------------
debian/rules.d/binary-d.mk | 4 +
debian/rules.patch | 1 -
debian/rules2 | 4 +
6 files changed, 13 insertions(+), 175 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 72140ec..efa5cdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ gcc-6 (6.3.0-1) UNRELEASED; urgency=medium
* Configure --with-cpu-32=ultrasparc on sparc. Closes: #845461.
* Update gdc to the GCC-6 branch (20161222).
* Don't mark libphobos multilib packages as M-A: same.
+ * Configure libphobos builds with --with-target-system-zlib.
+ * Stop applying PR c++/77379.
[ Samuel Thibault ]
* libgo fixup for program invocation name.
diff --git a/debian/patches/libphobos-zlib.diff b/debian/patches/libphobos-zlib.diff
index a2dad20..1aa8282 100644
--- a/debian/patches/libphobos-zlib.diff
+++ b/debian/patches/libphobos-zlib.diff
@@ -16,7 +16,7 @@ Index: b/src/libphobos/m4/druntime/libraries.m4
===================================================================
--- a/src/libphobos/m4/druntime/libraries.m4
+++ b/src/libphobos/m4/druntime/libraries.m4
-@@ -39,18 +39,42 @@ AC_DEFUN([DRUNTIME_LIBRARIES_ZLIB],
+@@ -39,18 +39,44 @@ AC_DEFUN([DRUNTIME_LIBRARIES_ZLIB],
[
AC_ARG_WITH(target-system-zlib,
AS_HELP_STRING([--with-target-system-zlib],
@@ -39,6 +39,7 @@ Index: b/src/libphobos/m4/druntime/libraries.m4
+ LIBS="$LIBS -lz"
+ dnl the link test is not good enough for ARM32 multilib detection,
+ dnl first check to link, then to run
++ AC_LANG_PUSH(C)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([#include <zlib.h>],[gzopen("none", "rb")])],
+ [
@@ -67,6 +68,7 @@ Index: b/src/libphobos/m4/druntime/libraries.m4
+ else
+ AC_MSG_RESULT([not enabled])
+ fi
++ AC_LANG_POP
AM_CONDITIONAL([DRUNTIME_ZLIB_SYSTEM], [test "$with_target_system_zlib" = yes])
])
diff --git a/debian/patches/pr77379.diff b/debian/patches/pr77379.diff
deleted file mode 100644
index c746311..0000000
--- a/debian/patches/pr77379.diff
+++ /dev/null
@@ -1,173 +0,0 @@
-# DP: Fix PR c++/77379, taken from the trunk.
-
-gcc/cp/
-
-2016-08-29 Jason Merrill <jason at redhat.com>
-
- PR c++/77379
- * mangle.c (maybe_check_abi_tags): Add version parm, handle thunks.
- (mangle_thunk): Add thunk parameter.
- * method.c (finish_thunk): Pass it.
- * cp-tree.h: Declare it.
-
-
-Index: b/src/gcc/testsuite/g++.dg/abi/abi-tag23a.C
-===================================================================
---- /dev/null
-+++ b/src/gcc/testsuite/g++.dg/abi/abi-tag23a.C
-@@ -0,0 +1,35 @@
-+// PR c++/77379
-+// { dg-options -fabi-version=10 }
-+
-+struct __attribute ((abi_tag ("bar"))) string { };
-+
-+struct Mother
-+{
-+ virtual ~Mother() {};
-+ int bar;
-+};
-+
-+struct Father
-+{
-+ virtual string get_foo() = 0;
-+};
-+
-+class Derived:
-+ public Mother,
-+ public Father
-+{
-+public:
-+ string get_foo();
-+};
-+
-+struct Final:
-+ public Derived
-+{
-+};
-+
-+int main()
-+{
-+ Final().get_foo();
-+}
-+
-+// { dg-final { scan-assembler "_ZThn16_N7Derived7get_fooEv" } }
-Index: b/src/gcc/testsuite/g++.dg/abi/abi-tag23.C
-===================================================================
---- /dev/null
-+++ b/src/gcc/testsuite/g++.dg/abi/abi-tag23.C
-@@ -0,0 +1,35 @@
-+// PR c++/77379
-+// { dg-options "-fabi-version=0 -Wabi=10" }
-+
-+struct __attribute ((abi_tag ("bar"))) string { };
-+
-+struct Mother
-+{
-+ virtual ~Mother() {};
-+ int bar;
-+};
-+
-+struct Father
-+{
-+ virtual string get_foo() = 0;
-+};
-+
-+class Derived:
-+ public Mother,
-+ public Father
-+{
-+public:
-+ string get_foo(); // { dg-warning "mangled name" }
-+};
-+
-+struct Final:
-+ public Derived
-+{
-+};
-+
-+int main()
-+{
-+ Final().get_foo();
-+}
-+
-+// { dg-final { scan-assembler "_ZThn16_N7Derived7get_fooB3barEv" } }
-Index: b/src/gcc/cp/method.c
-===================================================================
---- a/src/gcc/cp/method.c
-+++ b/src/gcc/cp/method.c
-@@ -169,7 +169,7 @@ finish_thunk (tree thunk)
- virtual_offset = BINFO_VPTR_FIELD (virtual_offset);
- function = THUNK_TARGET (thunk);
- name = mangle_thunk (function, DECL_THIS_THUNK_P (thunk),
-- fixed_offset, virtual_offset);
-+ fixed_offset, virtual_offset, thunk);
-
- /* We can end up with declarations of (logically) different
- covariant thunks, that do identical adjustments. The two thunks
-Index: b/src/gcc/cp/mangle.c
-===================================================================
---- a/src/gcc/cp/mangle.c
-+++ b/src/gcc/cp/mangle.c
-@@ -223,7 +223,7 @@ static void write_local_name (tree, cons
- static void dump_substitution_candidates (void);
- static tree mangle_decl_string (const tree);
- static int local_class_index (tree);
--static void maybe_check_abi_tags (tree, tree = NULL_TREE);
-+static void maybe_check_abi_tags (tree, tree = NULL_TREE, int = 10);
-
- /* Control functions. */
-
-@@ -3885,10 +3885,13 @@ mangle_call_offset (const tree fixed_off
-
- tree
- mangle_thunk (tree fn_decl, const int this_adjusting, tree fixed_offset,
-- tree virtual_offset)
-+ tree virtual_offset, tree thunk)
- {
- tree result;
-
-+ if (abi_version_at_least (11))
-+ maybe_check_abi_tags (fn_decl, thunk, 11);
-+
- start_mangling (fn_decl);
-
- write_string ("_Z");
-@@ -4003,7 +4006,7 @@ mangle_conv_op_name_for_type (const tree
- guard variable for T. */
-
- static void
--maybe_check_abi_tags (tree t, tree for_decl)
-+maybe_check_abi_tags (tree t, tree for_decl, int ver)
- {
- if (DECL_ASSEMBLER_NAME_SET_P (t))
- return;
-@@ -4018,9 +4021,14 @@ maybe_check_abi_tags (tree t, tree for_d
- if (!attr)
- attr = lookup_attribute ("abi_tag", DECL_ATTRIBUTES (t));
- if (attr && TREE_VALUE (attr) != oldtags
-- && abi_version_crosses (10))
-+ && abi_version_crosses (ver))
- {
-- if (for_decl)
-+ if (for_decl && DECL_THUNK_P (for_decl))
-+ warning_at (DECL_SOURCE_LOCATION (t), OPT_Wabi,
-+ "the mangled name of a thunk for %qD changes between "
-+ "-fabi-version=%d and -fabi-version=%d",
-+ t, flag_abi_version, warn_abi_version);
-+ else if (for_decl)
- warning_at (DECL_SOURCE_LOCATION (for_decl), OPT_Wabi,
- "the mangled name of %qD changes between "
- "-fabi-version=%d and -fabi-version=%d",
-Index: b/src/gcc/cp/cp-tree.h
-===================================================================
---- a/src/gcc/cp/cp-tree.h
-+++ b/src/gcc/cp/cp-tree.h
-@@ -6757,7 +6757,7 @@ extern tree mangle_typeinfo_string_for_t
- extern tree mangle_vtbl_for_type (tree);
- extern tree mangle_vtt_for_type (tree);
- extern tree mangle_ctor_vtbl_for_type (tree, tree);
--extern tree mangle_thunk (tree, int, tree, tree);
-+extern tree mangle_thunk (tree, int, tree, tree, tree);
- extern tree mangle_conv_op_name_for_type (tree);
- extern tree mangle_guard_variable (tree);
- extern tree mangle_tls_init_fn (tree);
diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk
index c409f68..21b27da 100644
--- a/debian/rules.d/binary-d.mk
+++ b/debian/rules.d/binary-d.mk
@@ -101,6 +101,10 @@ $(binary_stamp)-gdc: $(install_stamp)
$(dh_compat2) dh_movefiles -p$(p_gdc) -X/zlib/ $(files_gdc)
+ifeq ($(with_libphobos),yes)
+ mv $(d)/$(usr_lib)/libgphobos.spec $(d_gdc)/$(gcc_lib_dir)/
+endif
+
ifeq ($(unprefixed_names),yes)
ln -sf $(cmd_prefix)gdc$(pkg_ver) \
$(d_gdc)/$(PF)/bin/gdc$(pkg_ver)
diff --git a/debian/rules.patch b/debian/rules.patch
index a14e460..96f0318 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -91,7 +91,6 @@ debian_patches += \
libjava-mips64el \
PR55947-revert \
gccgo-issue16780 \
- pr77379 \
$(if $(with_linaro_branch),,vulcan-cpu) \
$(if $(with_linaro_branch),,vulcan-costs) \
libffi-pax \
diff --git a/debian/rules2 b/debian/rules2
index e634a99..880dfc8 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -394,6 +394,10 @@ ifeq ($(with_gcj),yes)
endif
endif
+ifeq ($(with_libphobos),yes)
+ CONFARGS += --with-target-system-zlib
+endif
+
ifeq ($(with_objc)-$(with_objc_gc),yes-yes)
CONFARGS += --enable-objc-gc=auto
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git
More information about the Reproducible-commits
mailing list