Another ARM patch

[Jim Pick <jim@jimpick.com>]

Hi,

Here are some more fixes to get everything working on ARM.  I did this
against 0pre7.

I used "Architecture: any" instead of "Architecture: ARCH" in
control.in for the the gcc-soft-float package, because of the cpp bug
I encountered.

Cheers,

 - Jim

diff -urN ../previous/gcc-2.95/debian/control.in gcc-2.95/debian/control.in
--- ../previous/gcc-2.95/debian/control.in	Wed Jul 21 12:46:24 1999
+++ gcc-2.95/debian/control.in	Wed Jul 21 14:52:16 1999
@@ -457,3 +457,21 @@
  These are versions of basic static libraries such as libgcc.a compiled
  with the -msoft-float option, for CPUs without a floating-point unit.
 #endif
+
+#if defined(__arm__)
+Package: PN(gcc-soft-float)
+Architecture: any
+Priority: PRI(optional)
+Depends: ${shlibs:Depends}, PN(gcc) (>= CV), PN(gcc) (<< NV)
+#ifdef SNAPSHOT
+Conflicts: egcs-soft-float-ss
+Replaces: egcs-soft-float-ss
+#else
+Conflicts: egcs-soft-float
+Replaces: egcs-soft-float, egcs-soft-float-ss, gcc-soft-float-ss (<< NV)
+#endif
+Description: The soft-floating-point gcc libraries
+ SNAPSHOT_WARNING
+ These are versions of basic static libraries such as libgcc.a compiled
+ with the -msoft-float option, for CPUs without a floating-point unit.
+#endif
diff -urN ../previous/gcc-2.95/debian/patches/arm-config.dpatch gcc-2.95/debian/patches/arm-config.dpatch
--- ../previous/gcc-2.95/debian/patches/arm-config.dpatch	Wed Jul 21 12:46:24 1999
+++ gcc-2.95/debian/patches/arm-config.dpatch	Sun Jul 18 13:07:00 1999
@@ -1,7 +1,5 @@
 #! /bin/sh -e
 
-#! /bin/sh -e
-
 # DP: Some fixes for ARM from Philip Blundell
 
 if [ $# -ne 1 ]; then
diff -urN ../previous/gcc-2.95/debian/rules gcc-2.95/debian/rules
--- ../previous/gcc-2.95/debian/rules	Wed Jul 21 12:46:24 1999
+++ gcc-2.95/debian/rules	Wed Jul 21 14:19:40 1999
@@ -481,6 +481,11 @@
   d_nof  = debian/$(p_nof)
 endif
 
+ifeq ($(BUILD_ARCH),arm)
+  p_softfloat  = gcc-soft-float$(ss_suffix)
+  d_softfloat  = debian/$(p_softfloat)
+endif
+
 dirs_gcc = \
 	usr/doc/$(p_gcc) \
 	$(PF)/bin \
@@ -510,6 +515,19 @@
 	$(PF)/lib/gcc-lib/$(BUILD_SYSTEM)/$(VER)/nof
 endif
 
+ifeq ($(BUILD_ARCH),arm)
+  dirs_gcc += \
+	$(PF)/lib/soft-float \
+	$(PF)/lib/gcc-lib/$(BUILD_SYSTEM)/$(VER)/soft-float \
+	$(PF)/$(BUILD_SYSTEM)/lib/soft-float
+  dirs_softfloat = \
+	$(PF)/lib/soft-float \
+	$(PF)/lib/gcc-lib/$(BUILD_SYSTEM)/$(VER)/soft-float
+  files_softfloat = \
+	$(PF)/lib/soft-float \
+	$(PF)/lib/gcc-lib/$(BUILD_SYSTEM)/$(VER)/soft-float
+endif
+
 dirs_cpp = \
 	usr/doc/$(p_cpp) \
 	$(PF)/share/man/man1 \
@@ -669,6 +687,11 @@
 files_doc = \
 	$(PF)/share/info/gcc*
 
+ifeq ($(BUILD_ARCH),arm)
+  dirs_gcc += $(PF)/lib/soft-float
+endif
+
+
 # ----------------------------------------------------------------------
 install: install-stamp first-move-stamp
 install-stamp: build-stamp
@@ -704,6 +727,9 @@
 ifeq ($(BUILD_ARCH),powerpc)
 	dh_installdirs -p$(p_nof) $(dirs_nof)
 endif
+ifeq ($(BUILD_ARCH),arm)
+	dh_installdirs -p$(p_softfloat) $(dirs_softfloat)
+endif
 	: # Install everything
 ifneq ($(SNAPSHOT),yes)
 	PATH=$(PWD)/$(builddir)/texinfo/util:$$PATH \
@@ -792,6 +818,9 @@
     endif
   endif
 endif
+ifeq ($(BUILD_ARCH),arm)
+	dh_movefiles -p$(p_softfloat) $(files_softfloat)
+endif
 	dh_movefiles -p$(p_cpp) $(files_cpp)
 	dh_movefiles -p$(p_cppd) $(files_cppd)
 	dh_movefiles -p$(p_objc) $(files_objc)
@@ -1011,7 +1040,7 @@
   debian_patches += ppc-library-prefix
 endif
 ifeq ($(BUILD_ARCH),arm)
-  debian_patches += arm-config
+  debian_patches += arm-config ppc-library-prefix
 endif
 ifeq ($(BUILD_ARCH),m68k)
   debian_patches += 68060-build