[gcc-6] 263/401: * Avoid warning for libgcc symbols files.

[Ximin Luo]

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 af0682b7c3dae00673cabdf064d1f417e98db44b
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Nov 16 11:19:07 2016 +0000

      * Avoid warning for libgcc symbols files.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9062 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                |  1 +
 debian/libgcc.symbols           | 25 +++++++++++++++----------
 debian/rules.d/binary-libgcc.mk |  2 +-
 debian/rules.defs               | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d219523..690bbe5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-6 (6.2.0-14) UNRELEASED; urgency=medium
 
   * Update libasan symbol files.
   * Build libgfortran libraries when building without common libs.
+  * Avoid warning for libgcc symbols files.
 
  -- Matthias Klose <doko at debian.org>  Fri, 11 Nov 2016 09:25:09 +0100
 
diff --git a/debian/libgcc.symbols b/debian/libgcc.symbols
index e035a28..a150607 100644
--- a/debian/libgcc.symbols
+++ b/debian/libgcc.symbols
@@ -2,19 +2,24 @@ 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-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
diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk
index a2e6c74..0dc4f41 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 28f0782..9e8c844 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -513,6 +513,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-6.git