[gcc-7] 72/354: - update gdc patches for the trunk
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:32 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 a41d9f900637ada111d8f660bcea3b6ebd1376a7
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Mon Dec 12 16:29:11 2016 +0000
- update gdc patches for the trunk
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9179 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/patches/gdc-hacks.diff | 11 ---------
debian/patches/gdc-libphobos-link.diff | 44 +++++++++++++++++-----------------
debian/patches/libphobos-soname.diff | 7 ------
debian/rules.patch | 2 --
4 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/debian/patches/gdc-hacks.diff b/debian/patches/gdc-hacks.diff
deleted file mode 100644
index c6a0b70..0000000
--- a/debian/patches/gdc-hacks.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gcc/d/d-attribs.c
-+++ b/src/gcc/d/d-attribs.c
-@@ -588,8 +588,6 @@
-
- if (targetm_common.have_named_sections)
- {
-- user_defined_section_attribute = true;
--
- if (VAR_OR_FUNCTION_DECL_P (decl)
- && TREE_CODE (TREE_VALUE (args)) == STRING_CST)
- {
diff --git a/debian/patches/gdc-libphobos-link.diff b/debian/patches/gdc-libphobos-link.diff
index c62de39..6b008b2 100644
--- a/debian/patches/gdc-libphobos-link.diff
+++ b/debian/patches/gdc-libphobos-link.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/d/d-spec.c
===================================================================
--- a/src/gcc/d/d-spec.c
+++ b/src/gcc/d/d-spec.c
-@@ -36,6 +36,8 @@
+@@ -35,6 +35,8 @@ along with GCC; see the file COPYING3.
#define WITHLIBCXX (1<<5)
/* this bit is set if they did `-lc'. */
#define WITHLIBC (1<<6)
@@ -13,7 +13,7 @@ Index: b/src/gcc/d/d-spec.c
/* This bit is set when the argument should not be passed to gcc or the backend */
#define SKIPOPT (1<<8)
-@@ -75,6 +77,10 @@
+@@ -74,6 +76,10 @@ along with GCC; see the file COPYING3.
#define LIBDRUNTIME_PROFILE LIBDRUNTIME
#endif
@@ -24,29 +24,29 @@ Index: b/src/gcc/d/d-spec.c
void
lang_specific_driver (cl_decoded_option **in_decoded_options,
unsigned int *in_decoded_options_count,
-@@ -123,6 +129,9 @@ lang_specific_driver (cl_decoded_option
- /* "-lstdc++" if it appears on the command line. */
- const cl_decoded_option *saw_libcxx = 0;
-
-+ /* "-ldl" if it appears on the command line. */
-+ const cl_decoded_option *saw_dl = 0;
-+
- /* An array used to flag each argument that needs a bit set for
- DSOURCE, MATHLIB, WITHTHREAD, WITHLIBC or WITHLIBCXX. */
- int *args;
-@@ -139,6 +148,9 @@ lang_specific_driver (cl_decoded_option
+@@ -129,6 +135,9 @@ lang_specific_driver (cl_decoded_option
/* By default, we throw on the time library if we have one. */
- int need_time = (TIME_LIBRARY[0] != '\0');
+ bool need_time = (TIME_LIBRARY[0] != '\0');
+ /* By default, we throw on the dl library if we have one. */
+ int need_dl = (DL_LIBRARY[0] != '\0');
+
/* True if we saw -static. */
- int static_link = 0;
+ bool static_link = false;
-@@ -248,6 +260,11 @@ lang_specific_driver (cl_decoded_option
+@@ -162,6 +171,9 @@ lang_specific_driver (cl_decoded_option
+ /* The number of libraries added in. */
+ int added_libraries = *in_added_libraries;
+
++ /* "-ldl" if it appears on the command line. */
++ const cl_decoded_option *saw_dl = 0;
++
+ /* An array used to flag each argument that needs a bit set for
+ DSOURCE, MATHLIB, WITHTHREAD, WITHLIBC or WITHLIBCXX. */
+ int *args = XCNEWVEC (int, argc);
+@@ -229,6 +241,11 @@ lang_specific_driver (cl_decoded_option
args[i] |= TIMELIB;
- need_time = 0;
+ need_time = false;
}
+ else if (strcmp (arg, DL_LIBRARY) == 0)
+ {
@@ -56,7 +56,7 @@ Index: b/src/gcc/d/d-spec.c
else if (strcmp (arg, "c") == 0)
args[i] |= WITHLIBC;
else
-@@ -423,6 +440,12 @@ lang_specific_driver (cl_decoded_option
+@@ -392,6 +409,12 @@ lang_specific_driver (cl_decoded_option
saw_time = &decoded_options[i];
}
@@ -69,9 +69,9 @@ Index: b/src/gcc/d/d-spec.c
if (!saw_libc && (args[i] & WITHLIBC) && library > 0)
{
--j;
-@@ -483,9 +506,6 @@ lang_specific_driver (cl_decoded_option
+@@ -449,9 +472,6 @@ lang_specific_driver (cl_decoded_option
/* Add `-lgphobos' if we haven't already done so. */
- if (library > 0 && phobos)
+ if (library > 0 && need_phobos)
{
- // Default to static linking
- if (library == 1)
@@ -79,7 +79,7 @@ Index: b/src/gcc/d/d-spec.c
#ifdef HAVE_LD_STATIC_DYNAMIC
if (library == 3 && static_link)
-@@ -510,6 +530,10 @@ lang_specific_driver (cl_decoded_option
+@@ -476,6 +496,10 @@ lang_specific_driver (cl_decoded_option
CL_DRIVER, &new_decoded_options[j]);
added_libraries++;
j++;
@@ -90,7 +90,7 @@ Index: b/src/gcc/d/d-spec.c
#ifdef HAVE_LD_STATIC_DYNAMIC
if (library == 3 && static_link)
-@@ -580,6 +604,15 @@ lang_specific_driver (cl_decoded_option
+@@ -546,6 +570,15 @@ lang_specific_driver (cl_decoded_option
&new_decoded_options[j++]);
added_libraries++;
}
diff --git a/debian/patches/libphobos-soname.diff b/debian/patches/libphobos-soname.diff
deleted file mode 100644
index 177193f..0000000
--- a/debian/patches/libphobos-soname.diff
+++ /dev/null
@@ -1,7 +0,0 @@
-# DP: Use a Debian policy compliant soname for the shared libphobos library.
-
---- a/src/libphobos/PHOBOS_VERSION
-+++ b/src/libphobos/PHOBOS_VERSION
-@@ -1 +1 @@
---release 2.068
-+-version-info 68:0:0
diff --git a/debian/rules.patch b/debian/rules.patch
index 75998d6..0900a06 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -143,8 +143,6 @@ ifeq ($(with_d),yes)
debian_patches += \
gdc-7 \
gdc-updates \
- gdc-hacks \
- libphobos-soname \
libphobos-zlib \
gdc-versym-cpu \
gdc-versym-os \
--
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