Merge svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8

Conflicts:
	debian/changelog
	debian/control

1 files changed, 17 insertions, 11 deletions

diff --git a/debian/rules.defs b/debian/rules.defs
index cb9c72f..b1a8a26 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -309,7 +309,7 @@ endif
 # build using fsf or linaro
 ifeq ($(distribution),Ubuntu)
   ifeq (,$(findstring gnat, $(PKGSOURCE)))
-  ifneq (,$(findstring $(DEB_TARGET_ARCH),amd64 i386 arm64 armel armhf))
+  ifneq (,$(findstring $(DEB_TARGET_ARCH),arm64 armel armhf))
     with_linaro_branch = yes
   endif
   endif
@@ -343,6 +343,11 @@ with_common_libs := yes
 # XXX: should with_common_libs be "yes" only if this is the default compiler
 # version on the targeted arch?
 
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy dapper hardy jaunty karmic lucid maverick oneiric precise quantal raring saucy trusty))
+  with_common_pkgs :=
+  with_common_libs :=
+endif
+
 # is this a multiarch-enabled build?
 ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick))
   with_multiarch_lib := yes
@@ -427,6 +432,8 @@ ifneq ($(DEB_STAGE),stage1)
   else
     ifneq ($(with_deps_on_target_arch_pkgs),yes)
       with_gccxbase := yes
+    else
+      with_gccbase := yes
     endif
   endif
 endif
@@ -739,10 +746,8 @@ with_go := $(call envfilt, go, , , $(with_go))
 # Build all packages needed for Go development
 ifneq (,$(findstring gcc, $(PKGSOURCE)))
   ifeq ($(with_go),yes)
-    ifeq ($(with_common_libs),yes)
-      with_libgo := yes
-    endif
     enabled_languages += go
+    with_libgo := yes
   endif
 endif
 
@@ -893,10 +898,9 @@ ifeq ($(with_objc),yes)
   ifeq ($(with_dev),yes)
     with_objcdev := yes
   endif
-  # libobjc soname change in 4.7
-  #ifeq ($(with_common_libs),yes)
+  ifeq ($(with_common_libs),yes)
     with_libobjc := yes
-  #endif
+  endif
 
   enabled_languages += objc
 endif
@@ -969,7 +973,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH),$(gomp_no_archs)))
 endif
 
 # itm --------------------
-itm_archs = amd64 i386 x32 ppc64 ppc64el
+itm_archs = amd64 arm64 i386 x32 ppc64 ppc64el
 ifneq (,$(filter $(DEB_TARGET_ARCH),$(itm_archs)))
   with_itm := yes
 endif
@@ -992,7 +996,7 @@ endif
 # asan / sanitizer --------------------
 with_asan :=
 with_asan := $(call envfilt, asan, , , $(with_asan))
-asan_archs = amd64 armel armhf i386 powerpc ppc64 sparc sparc64 x32
+asan_archs = amd64 armel armhf i386 powerpc ppc64 x32 sparc sparc64
 ifneq (,$(filter $(DEB_TARGET_ARCH),$(asan_archs)))
   with_asan := yes
 endif
@@ -1089,7 +1093,9 @@ else
   endif
 
   # libasan -----------------
-  ifeq ($(with_asan)-$(with_common_libs),yes-yes)
+  # soname change in 4.9
+  ifeq ($(with_asan),yes)
+  #ifeq ($(with_asan)-$(with_common_libs),yes-yes)
     #ifneq ($(DEB_CROSS),yes)
       with_libasan := yes
     #endif
@@ -1179,7 +1185,7 @@ ifeq ($(REVERSE_CROSS),yes)
   with_check := disabled for reverse cross build
 endif
 check_no_cpus := m68k
-check_no_systems := gnu
+check_no_systems := gnu kfreebsd-gnu
 ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(check_no_cpus)))
   with_check := disabled for cpu $(DEB_TARGET_ARCH_CPU)
 endif