[gcc-7] 14/354: * More symbol files updates.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:22 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 63be1476463592255157c0344c4d0b6590a834d7
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Tue Nov 15 14:22:50 2016 +0000
* More symbol files updates.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9054 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 9 ++++---
debian/libgcc.symbols | 29 ++++++++++++----------
debian/patches/gdc-libphobos-build.diff | 43 ++++++++++++++++-----------------
debian/rules.d/binary-libgcc.mk | 2 +-
debian/rules.defs | 33 +++++++++++++++++++++++++
5 files changed, 76 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 17e1ac1..9a57c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-gcc-7 (7-20161112-2) UNRELEASED; urgency=medium
+gcc-7 (7-20161115-1) experimental; urgency=medium
+ * GCC 7 snapshot build, taken from the trunk 20161115.
* More symbol files updates.
- * Update gdc to the trunk 20161114.
+ * Update gdc to the trunk 20161113.
* Update conflicts with GCC 6 packages. Closes: #844296.
- -- Matthias Klose <doko at debian.org> Sun, 13 Nov 2016 13:04:49 +0100
+ -- Matthias Klose <doko at debian.org> Tue, 15 Nov 2016 13:02:02 +0100
gcc-7 (7-20161112-1) experimental; urgency=medium
- * GCC 6 snapshot build, taken from the trunk 20161112.
+ * GCC 7 snapshot build, taken from the trunk 20161112.
* Remove gij/gcj packages, removed upstream.
* Don't build gdc and gnat for now.
diff --git a/debian/libgcc.symbols b/debian/libgcc.symbols
index 07c8dac..f601d05 100644
--- a/debian/libgcc.symbols
+++ b/debian/libgcc.symbols
@@ -2,22 +2,25 @@ libgcc_s.so.1 #PACKAGE# #MINVER#
(symver)GCC_3.0 1:3.0
(symver)GCC_3.3 1:3.3
(symver)GCC_3.3.1 1:3.3.1
- (symver|optional)GCC_3.3.2 1:3.3.2
- (symver|optional)GCC_3.3.4 1:3.3.4
+# __gcc_personality_sj0, __gcc_personality_v0
+#(symver|optional)GCC_3.3.2 1:3.3.2
+ (symver|arch=armel armhf mips mipsel mips64el powerpc powerpcspe sh4)GCC_3.3.4 1:3.3.4
(symver)GCC_3.4 1:3.4
(symver)GCC_3.4.2 1:3.4.2
- (symver|optional)GCC_3.4.4 1:3.4.4
- (symver|arch=armel armhf|ignore-blacklist)GCC_3.5 1:3.5
+#(symver|arch-bits=32)GCC_3.4.4 1:3.4.4
+ (symver|arch=!armel !armhf !any-i386 !mips !mipsel !powerpc !powerpcspe !s390 !sh4 !sparc)GCC_3.4.4 1:3.4.4
+ (symver|arch=armel armhf|ignore-blacklist)GCC_3.5 1:3.5
(symver)GCC_4.0.0 1:4.0
- (symver|optional)GCC_4.1.0 1:4.1
+ (symver|arch=powerpc)GCC_4.1.0 1:4.1
(symver)GCC_4.2.0 1:4.2
(symver)GCC_4.3.0 1:4.3
- (symver|optional)GCC_4.4.0 1:4.4
- (symver|optional)GCC_4.5.0 1:4.5
- (symver|optional)GCC_4.6.0 1:4.6
- (symver|optional)GCC_4.7.0 1:4.7
- (symver|optional)GCC_4.8.0 1:4.8
- (symver|optional)GLIBC_2.0 1:4.2
+ (symver|arch=any-i386 mips mipsel mips64el)GCC_4.4.0 1:4.4
+ (symver|arch=arm64 any-i386 mips64el)GCC_4.5.0 1:4.5
+#(symver|optional)GCC_4.6.0 1:4.6
+ (symver)GCC_4.7.0 1:4.7
+ (symver|arch=any-amd64 any-i386 x32)GCC_4.8.0 1:4.8
+ (symver|arch=!any-amd64 !x32)GLIBC_2.0 1:4.2
+ (symver|arch=s390x sh4 sparc64)GLIBC_2.2 1:4.2
+ (symver|arch=sparc)GCC_LDBL_3.0 at GCC_LDBL_3.0 1:3.0
+ (symver|arch=alpha sparc)GCC_LDBL_4.0.0 at GCC_LDBL_4.0.0 1:4.0
(symver)GCC_7.0.0 1:7
- (symver|optional)GCC_7.0.0 1:7
- (symver|arch=s390x)GLIBC_2.2 7
diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff
index 4a1e0fa..3e39641 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -836,32 +836,31 @@ Index: b/src/config-ml.in
===================================================================
--- a/src/config-ml.in
+++ b/src/config-ml.in
-@@ -513,6 +513,7 @@ multi-do:
+@@ -512,6 +512,7 @@ multi-do:
+ prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \
- GCJFLAGS="$(GCJFLAGS) $${flags}" \
GOCFLAGS="$(GOCFLAGS) $${flags}" \
+ GDCFLAGS="$(GDCFLAGS) $${flags}" \
CXXFLAGS="$(CXXFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
-@@ -746,7 +747,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
- break
+@@ -746,6 +747,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
fi
done
-- ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
-+ ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags" GDC="${GDC_}$flags"'
+ ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
++ ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags" GDC="${GDC_}$flags"'
if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' '
-@@ -755,6 +756,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
- GCJ_=$GCJ' '
+@@ -753,6 +755,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
+ F77_=$F77' '
GFORTRAN_=$GFORTRAN' '
GOC_=$GOC' '
+ GDC_=$GDC' '
else
# Create a regular expression that matches any string as long
# as ML_POPDIR.
-@@ -831,6 +833,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
+@@ -817,6 +820,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
esac
done
@@ -884,12 +883,12 @@ Index: b/src/config/multi.m4
===================================================================
--- a/src/config/multi.m4
+++ b/src/config/multi.m4
-@@ -65,4 +65,5 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+@@ -64,4 +64,5 @@ multi_basedir="$multi_basedir"
+ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
- GFORTRAN="$GFORTRAN"
--GCJ="$GCJ"])])dnl
-+GCJ="$GCJ"
+-GFORTRAN="$GFORTRAN"])])dnl
++GFORTRAN="$GFORTRAN"
+GDC="$GDC"])])dnl
Index: b/src/configure.ac
===================================================================
@@ -905,39 +904,39 @@ Index: b/src/configure.ac
# these tools are built using the target libraries, and are intended to
# run only in the target environment
-@@ -1259,6 +1260,7 @@ if test "${build}" != "${host}" ; then
- GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj}
+@@ -1258,6 +1259,7 @@ if test "${build}" != "${host}" ; then
+ CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
+ GDC_FOR_BUILD=${GDC_FOR_BUILD-gdc}
DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
LD_FOR_BUILD=${LD_FOR_BUILD-ld}
NM_FOR_BUILD=${NM_FOR_BUILD-nm}
-@@ -1273,6 +1275,7 @@ else
- GCJ_FOR_BUILD="\$(GCJ)"
+@@ -1271,6 +1273,7 @@ else
+ CXX_FOR_BUILD="\$(CXX)"
GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
GOC_FOR_BUILD="\$(GOC)"
+ GDC_FOR_BUILD="\$(GDC)"
DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
LD_FOR_BUILD="\$(LD)"
NM_FOR_BUILD="\$(NM)"
-@@ -3186,6 +3189,7 @@ AC_SUBST(DLLTOOL_FOR_BUILD)
- AC_SUBST(GCJ_FOR_BUILD)
+@@ -3183,6 +3186,7 @@ AC_SUBST(CXX_FOR_BUILD)
+ AC_SUBST(DLLTOOL_FOR_BUILD)
AC_SUBST(GFORTRAN_FOR_BUILD)
AC_SUBST(GOC_FOR_BUILD)
+AC_SUBST(GDC_FOR_BUILD)
AC_SUBST(LDFLAGS_FOR_BUILD)
AC_SUBST(LD_FOR_BUILD)
AC_SUBST(NM_FOR_BUILD)
-@@ -3296,6 +3300,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TA
- NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
+@@ -3292,6 +3296,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TA
+ NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
NCN_STRICT_CHECK_TARGET_TOOLS(GOC_FOR_TARGET, gccgo)
+NCN_STRICT_CHECK_TARGET_TOOLS(GDC_FOR_TARGET, gdc)
ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
-@@ -3329,6 +3334,8 @@ GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_T
+@@ -3325,6 +3330,8 @@ GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_T
[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC,
[gcc/gccgo -B$$r/$(HOST_SUBDIR)/gcc/], go)
diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk
index 72a7642..c0268bd 100644
--- a/debian/rules.d/binary-libgcc.mk
+++ b/debian/rules.d/binary-libgcc.mk
@@ -303,7 +303,7 @@ define __do_libgcc
ln -sf libgcc.symbols debian/$(p_l).symbols \
)
$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l) -p$(p_d) \
- -- -v$(DEB_LIBGCC_VERSION)
+ -- -v$(DEB_LIBGCC_VERSION) -a$(call mlib_to_arch,$(2)) || echo XXXXXXXXXXXXXX ERROR $(p_l)
$(call cross_mangle_shlibs,$(p_l))
$(if $(filter arm-linux-gnueabi%,$(DEB_TARGET_GNU_TYPE)),
if head -1 $(d_l)/DEBIAN/symbols 2>/dev/null | grep -q '^lib'; then \
diff --git a/debian/rules.defs b/debian/rules.defs
index d724ee0..11b6d7d 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -497,6 +497,39 @@ multilib_multiarch_map = \
mlib_to_march = $(patsubst $(DEB_TARGET_ARCH)/$(1)=%,%, \
$(filter $(DEB_TARGET_ARCH)/$(1)=%,$(multilib_multiarch_map)))
+multilib_arch_map = \
+ $(DEB_TARGET_ARCH)/=$(DEB_TARGET_ARCH) \
+ amd64/32=i386 \
+ amd64/x32=x32 \
+ armel/hf=armhf \
+ armhf/sf=armel \
+ i386/64=amd64 \
+ i386/x32=x32 \
+ powerpc/64=ppc64 \
+ ppc64/32=powerpc \
+ sparc/64=sparc64 \
+ sparc64/32=sparc \
+ s390/64=s390x \
+ s390x/32=s390 \
+ mips/n32=mipsn32 \
+ mips/64=mips64 \
+ mipsel/n32=mipsn32el \
+ mipsel/64=mips64el \
+ mipsn32/32=mips \
+ mipsn32/64=mips64 \
+ mipsn32el/32=mipsel \
+ mipsn32el/64=mips64el \
+ mips64/32=mips \
+ mips64/n32=mipsn32 \
+ mips64el/32=mipsel \
+ mips64el/n32=mipsn32el \
+ x32/32=i386 \
+ x32/64=amd64 \
+ kfreebsd-amd64/32=kfreebsd-i386
+# $(call mlib_to_arch,<empty>|32|64|n32|x32|hf|sf)
+mlib_to_arch = $(patsubst $(DEB_TARGET_ARCH)/$(1)=%,%, \
+ $(filter $(DEB_TARGET_ARCH)/$(1)=%,$(multilib_arch_map)))
+
# build -base packages
with_gccbase := yes
ifeq ($(build_type),build-cross)
--
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