diff -ru debian.org/control.m4 debian/control.m4
--- debian.org/control.m4       2005-01-06 12:15:17.000000000 +0100
+++ debian/control.m4   2005-01-06 17:06:15.000000000 +0100
@@ -131,7 +131,9 @@
 Architecture: any
 Section: devel
 Priority: ifdef(`TARGET',`extra',`PRI(standard)')
-Depends: gcc`'PV-base (>= CV), libgcc`'GCC_SO`'LS (>= ifelse(GCC_SO,1,CEV,CV)), ${shlibs:Depends}, cpp`'PV`'TS (>= CV), cpp`'PV`'TS (<< NV), binutils`'TS (>= BINUTILSV)ifelse(ARCH,`ia64',`, libunwind7-dev (>= 0.98.3-3)')
+Depends: gcc`'PV-base (>= CV), `'dnl
+ifenabled(`libgcc',`libgcc`'GCC_SO`'LS (>= ifelse(GCC_SO,1,CEV,CV)), ')`'dnl 
+${shlibs:Depends}, cpp`'PV`'TS (>= CV), cpp`'PV`'TS (<< NV), binutils`'TS (>= BINUTILSV)ifelse(ARCH,`ia64',`, libunwind7-dev (>= 0.98.3-3)')
 Recommends: ifdef(`TARGET',`libc6-dev`'LS | libc-dev`'LS',`LIBC_DEP')
 Conflicts: gcc-3.2`'TS (<= 1:3.2.3-0pre8)
 Suggests: gcc`'PV-doc (>= CV)ifelse(ARCH,`i386',`, amd64-libs-dev',ARCH,`amd64',`, lib32gcc1')
diff -ru debian.org/rules.conf debian/rules.conf
--- debian.org/rules.conf	2005-01-06 12:15:17.000000000 +0100
+++ debian/rules.conf	2005-01-06 16:05:49.000000000 +0100
@@ -165,7 +165,10 @@
 
 ifdef DEB_CROSS
   languages = c c++
-  addons = libgcc lib64gcc libcxx lib64cxx cdev c++dev
+  addons = libcxx lib64cxx cdev c++dev
+  ifeq ($(with_libgcc),yes)
+    addons += libgcc lib64gcc 
+  endif
 else
   languages = ada c c++ f77 java objc pascal treelang
   addons = cdev c++dev fastjar fdev fixincl javadev libcxx libg2c \
diff -ru debian.org/rules.d/binary-gcc-cross.mk debian/rules.d/binary-gcc-cross.mk
--- debian.org/rules.d/binary-gcc-cross.mk	2005-01-06 12:15:17.000000000 +0100
+++ debian/rules.d/binary-gcc-cross.mk	2005-01-06 13:26:50.000000000 +0100
@@ -11,8 +11,6 @@
 	$(PF)/share/man/man1 $(libdir)
 
 files_gcc = \
-	$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver) \
-	$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver).1 \
 	$(gcc_lexec_dir)/collect2 \
 	$(gcc_lib_dir)/{specs,libgcc*,*.o} \
 	$(gcc_lib_dir)/include/README \
@@ -22,6 +20,12 @@
 		    && echo $(gcc_lib_dir)/include/$$d; \
 		done)
 
+ifneq ($(GCC_TARGET),none)
+    files_gcc += \
+	$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver) \
+	$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver).1 
+endif
+
 ifeq ($(biarch),yes)
     files_gcc += $(gcc_lib_dir)/64/{libgcc*,*.o}
 endif
@@ -50,6 +54,10 @@
     files_gcc += $(gcc_lib_dir)/include/{altivec.h,ppc-asm.h}
 endif
 
+ifeq ($(GCC_TARGET),none)
+    files_gcc += $(shell cd debian/tmp/ ; find . -name *$(DEB_TARGET_GNU_TYPE)*)
+endif
+
 usr_doc_files = debian/README.Bugs \
 	$(shell test -f $(srcdir)/FAQ && echo $(srcdir)/FAQ)
 ifeq ($(with_check),yes)
@@ -78,7 +86,7 @@
 #	dh_installdebconf
 	debian/dh_doclink -p$(p_gcc) $(p_base)
 	debian/dh_rmemptydirs -p$(p_gcc)
-	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_gcc)
+	-PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_gcc)
 	dh_compress -p$(p_gcc)
 	dh_fixperms -p$(p_gcc)
 	dh_shlibdeps -p$(p_gcc)
diff -ru debian.org/rules.defs debian/rules.defs
--- debian.org/rules.defs	2005-01-06 12:15:17.000000000 +0100
+++ debian/rules.defs	2005-01-06 16:20:38.000000000 +0100
@@ -13,6 +13,7 @@
 lib64		= lib64
 
 with_newlib:=yes
+#WITHOUT_LANG=c++ # Dissbale c++ support
 
 # version of default gcc compiler (e.g. 3.3 or 3.4)
 BUILD_CC_VERSION:= $(shell gcc -dumpversion | sed 's/\([0-9]*\.[0-9]*\)\(.*\)/\1/')
@@ -85,6 +86,7 @@
 	@echo DEB_TARGET_ARCH: $(DEB_TARGET_ARCH)
 	@echo DEB_TARGET_GNU_CPU: $(DEB_TARGET_GNU_CPU)
 	@echo DEB_TARGET_GNU_SYSTEM: $(DEB_TARGET_GNU_SYSTEM)
+	@echo DEB_TARGET_GNU_TYPE: $(DEB_TARGET_GNU_TYPE)
 	@echo GCC_TARGET: $(GCC_TARGET)
 	@echo TP: $(TP)
 	@echo TS: $(TS)
@@ -496,8 +498,13 @@
 endif
 
 # Shared libgcc --------------------
-with_libgcc := no
-with_shared_libgcc := no
+ifeq ($(GCC_TARGET),none)
+  with_libgcc := no
+  with_shared_libgcc := no
+else
+  with_libgcc := yes
+  with_shared_libgcc := yes
+endif
 
 #ifeq ($(with_common_libs),yes)
 #  with_libgcc := yes
diff -ru debian.org/rules2 debian/rules2
--- debian.org/rules2	2005-01-06 12:15:17.000000000 +0100
+++ debian/rules2	2005-01-06 16:02:55.000000000 +0100
@@ -83,11 +83,16 @@
 	--prefix=/$(PF) \
 	--libexecdir=/$(libexecdir) \
 	--with-gxx-include-dir=/$(cxx_inc_dir) \
-	--enable-shared \
 	--with-system-zlib \
 	--enable-nls \
 	--without-included-gettext
 
+ifeq ($(DEB_TARGET_GNU_TYPE),m68k-elf)
+  CONFARGS += --disable-shared 
+else
+  CONFARGS += --enable-shared 
+endif
+
 ifeq ($(versioned_packages),yes)
   CONFARGS += --program-suffix=-$(BASE_VERSION)
 endif
@@ -169,6 +174,9 @@
 ifeq ($(with_newlib),yes)
   CONFARGS += --with-newlib
 endif
+ifeq ($(DEB_TARGET_GNU_TYPE),m68k-elf)
+  CONFARGS += --disable-pic
+endif
 
 bootstrap_target = profiledbootstrap
 
