- Remove trunk distinctions, which are not needed with current trunk

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@6254 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

4 files changed, 8 insertions, 23 deletions

diff --git a/debian/rules.conf b/debian/rules.conf
index 3e3cd74..2452127 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -142,7 +142,7 @@ endif
 # We need binutils (>= 2.19.1) for a new dwarf unwind expression opcode.
 # See http://gcc.gnu.org/ml/gcc-patches/2008-09/msg01713.html
 ifeq ($(trunk_build),yes)
-  BINUTILSV = 2.22
+  BINUTILSV = 2.23
 else
   BINUTILSV = 2.22
 endif
diff --git a/debian/rules.defs b/debian/rules.defs
index b6c7b0b..e8a2a99 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -630,13 +630,10 @@ ifneq (,$(findstring gccgo, $(PKGSOURCE)))
   with_standalone_go := yes
 endif
 
-go_no_cpus := avr arm hppa m68k sh4 sparc sparc64
+go_no_cpus := avr arm arm64 hppa m68k sh4 sparc sparc64
 ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick natty oneiric))
   go_no_cpus := $(filter-out arm, $(go_no_cpus))
 endif
-ifneq ($(trunk_build),yes)
-  go_no_cpus := $(go_no_cpus) alpha arm64
-endif
 go_no_systems := gnu kfreebsd-gnu
 
 ifneq ($(with_base_only),yes)
diff --git a/debian/rules.patch b/debian/rules.patch
index 75ed421..f058a0e 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -207,11 +207,7 @@ ifeq ($(single_package),yes)
   debian_patches =
 endif
 
-ifeq ($(trunk_build),yes)
-  debian_patches += gcc-sysroot-trunk
-else
-  debian_patches += gcc-sysroot
-endif
+debian_patches += gcc-sysroot
 debian_patches += libgo-mksysinfo
 
 ifeq ($(with_softfloat),yes)
@@ -268,13 +264,9 @@ ifeq ($(biarch64),yes)
 endif
 debian_patches += gcc-powerpc-undef
 ifneq (,$(findstring /$(DEB_TARGET_ARCH)/,$(biarch32archs)))
-ifneq ($(DEB_TARGET_ARCH),x32)
-    ifeq ($(trunk_build),yes)
-      debian_patches += gcc-multilib64-multiarch-trunk
-    else
-      debian_patches += gcc-multilib64-multiarch
-    endif
-endif
+  ifneq ($(DEB_TARGET_ARCH),x32)
+    debian_patches += gcc-multilib64-multiarch
+  endif
 endif
 ifeq ($(DEB_TARGET_ARCH),x32)
   debian_patches += gcc-multilibx32-multiarch
diff --git a/debian/rules2 b/debian/rules2
index a39c6fe..5bc01bd 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -316,12 +316,8 @@ ifneq (,$(findstring powerpc64-linux,$(DEB_TARGET_GNU_TYPE)))
 endif
 
 ifeq ($(REVERSE_CROSS),yes)
-  # FIXME: requires ppl and cloog headers for the target
-  ifeq ($(trunk_build),yes)
-    CONFARGS += --without-isl
-  else
-    CONFARGS += --without-ppl
-  endif
+  # FIXME: requires isl and cloog headers for the target
+  CONFARGS += --without-isl
   # FIXME: build currently fails build the precompiled headers
   CONFARGS += --disable-libstdcxx-pch
 endif