[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: new binutils and glibc-2.2



Florian Lohoff writes:
 > On Sat, Jan 06, 2001 at 03:22:23PM +0100, Christoph Martin wrote:
 > > 
 > > after I built binutils with the patches from
 > > ftp.ds2.pg.gda.pl/pub/macro/SRPMS/ I could successfully build
 > > glibc-2.2 where the ld.so is working now.
 > > 
 > 
 > Could you always try to publish the source.debs too - I am just trying
 > to reproduce your work on mipsel and most of the patches
 > simply fail to apply.
 > 

Which patches did fail? I know that I messed up the patches for gcc. I
sent the correct patch to the gcc maintainer and append it to this
mail. 

I don't produce source.debs because I only build architecture
dependend binaries. (debian/rules binary-arch)

If you need refined patches, please let me know.

C


*** debian/patches/gcc-mips-linux.dpatch~	Thu Nov 23 22:21:46 2000
--- debian/patches/gcc-mips-linux.dpatch	Sun Dec 31 17:12:00 2000
***************
*** 0 ****
--- 1,279 ----
+ #! /bin/sh -e
+ 
+ if [ $# -eq 3 -a "$2" = '-d' ]; then
+     pdir="-d $3"
+ elif [ $# -ne 1 ]; then
+     echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+     exit 1
+ fi
+ case "$1" in
+     -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;;
+     -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;;
+     *)
+ 	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ 	exit 1
+ esac
+ exit 0
+ 
+ diff -up --recursive --new-file gcc-2.95.2.macro/gcc/config/mips/linux.h gcc-2.95.2/gcc/config/mips/linux.h
+ --- gcc-2.95.2.macro/gcc/config/mips/linux.h	Wed Apr 14 10:46:45 1999
+ +++ gcc-2.95.2/gcc/config/mips/linux.h	Thu Nov 16 07:25:03 2000
+ @@ -1,5 +1,5 @@
+  /* Definitions for MIPS running Linux-based GNU systems with ELF format.
+ -   Copyright (C) 1998 Free Software Foundation, Inc.
+ +   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+  
+  This file is part of GNU CC.
+  
+ @@ -18,16 +18,106 @@ along with GNU CC; see the file COPYING.
+  the Free Software Foundation, 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.  */
+  
+ -/* Required to keep collect2.c happy */
+ -#undef OBJECT_FORMAT_COFF 
+ +#undef TARGET_VERSION
+ +#if TARGET_ENDIAN_DEFAULT == 0
+ +#define TARGET_VERSION fprintf (stderr, " (MIPSel GNU/Linux with ELF)");
+ +#else
+ +#define TARGET_VERSION fprintf (stderr, " (MIPS GNU/Linux with ELF)");
+ +#endif
+ +
+ +#undef MD_EXEC_PREFIX
+ +#undef MD_STARTFILE_PREFIX
+ +
+ +/* Output at beginning of assembler file.  */
+ +/* The .file command should always begin the output.  */
+ +#undef ASM_FILE_START
+ +#define ASM_FILE_START(FILE)						\
+ +  do {									\
+ +	mips_asm_file_start (FILE);					\
+ +	fprintf (FILE, "\t.version\t\"01.01\"\n");			\
+ +  } while (0)
+ +
+  
+ -#define HAVE_ATEXIT
+ +/* Required to keep collect2.c happy */
+ +#undef OBJECT_FORMAT_COFF
+  
+  /* If we don't set MASK_ABICALLS, we can't default to PIC. */
+  #undef TARGET_DEFAULT
+  #define TARGET_DEFAULT (MASK_ABICALLS|MASK_GAS)
+  
+  
+ +/* Handle #pragma weak and #pragma pack.  */
+ +#define HANDLE_SYSV_PRAGMA 1
+ +
+ +/* Use more efficient ``thunks'' to implement C++ vtables. */
+ +#undef DEFAULT_VTABLE_THUNKS
+ +#define DEFAULT_VTABLE_THUNKS 1
+ +
+ +/* Don't assume anything about the header files.  */
+ +#define NO_IMPLICIT_EXTERN_C
+ +
+ +/* Generate calls to memcpy, etc., not bcopy, etc.  */
+ +#define TARGET_MEM_FUNCTIONS
+ +
+ +/* Specify predefined symbols in preprocessor.  */
+ +#undef CPP_PREDEFINES
+ +#if TARGET_ENDIAN_DEFAULT == 0
+ +#define CPP_PREDEFINES "-DMIPSEL -D_MIPSEL -Dunix -Dmips -D_mips \
+ +-DR3000 -D_R3000 -Dlinux -Asystem(posix) -Acpu(mips) \
+ +-Amachine(mips) -D__ELF__ -D__PIC__ -D__pic__"
+ +#else
+ +#define CPP_PREDEFINES "-DMIPSEB -D_MIPSEB -Dunix -Dmips -D_mips \
+ +-DR3000 -D_R3000 -Dlinux -Asystem(posix) -Acpu(mips) \
+ +-Amachine(mips) -D__ELF__ -D__PIC__ -D__pic__"
+ +#endif
+ +
+ +#undef SUBTARGET_CPP_SIZE_SPEC
+ +#define SUBTARGET_CPP_SIZE_SPEC "\
+ +%{mabi=32: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \
+ +%{mabi=n32: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \
+ +%{mabi=64: -D__SIZE_TYPE__=long\\ unsigned\\ int -D__PTRDIFF_TYPE__=long\\ int} \
+ +%{!mabi*: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int}"
+ +
+ +/* We must make -mips3 do what -mlong64 used to do.  */
+ +/* ??? If no mipsX option given, but a mabi=X option is, then should set
+ +   _MIPS_ISA based on the mabi=X option.  */
+ +/* ??? If no mabi=X option give, but a mipsX option is, then should set
+ +   _MIPS_SIM based on the mipsX option.  */
+ +/* ??? Same for _MIPS_SZINT.  */
+ +/* ??? Same for _MIPS_SZPTR.  */
+ +/* ??? Same for __SIZE_TYPE and __PTRDIFF_TYPE.  */
+ +#undef SUBTARGET_CPP_SPEC
+ +#define SUBTARGET_CPP_SPEC "\
+ +%{mfp32: -D_MIPS_FPSET=16} \
+ +%{mfp64: -D_MIPS_FPSET=32} \
+ +%{!mfp*: -D_MIPS_FPSET=32} \
+ +%{mips1: -D_MIPS_ISA=_MIPS_ISA_MIPS1} \
+ +%{mips2: -D_MIPS_ISA=_MIPS_ISA_MIPS2} \
+ +%{mips3: -D_MIPS_ISA=_MIPS_ISA_MIPS3} \
+ +%{mips4: -D_MIPS_ISA=_MIPS_ISA_MIPS4} \
+ +%{!mips*: -D_MIPS_ISA=_MIPS_ISA_MIPS1} \
+ +%{mabi=32: -D_MIPS_SIM=_MIPS_SIM_ABI32}	\
+ +%{mabi=n32: -D_ABIN32=2 -D_MIPS_SIM=_ABIN32} \
+ +%{mabi=64: -D_ABI64=3 -D_MIPS_SIM=_ABI64} \
+ +%{!mabi*: -D_ABIN32=2 -D_MIPS_SIM=_ABIN32} \
+ +%{!mint64: -D_MIPS_SZINT=32}%{mint64: -D_MIPS_SZINT=64} \
+ +%{mabi=32: -D_MIPS_SZLONG=32} \
+ +%{mabi=n32: -D_MIPS_SZLONG=32} \
+ +%{mabi=64: -D_MIPS_SZLONG=64} \
+ +%{!mabi*: -D_MIPS_SZLONG=32} \
+ +%{mabi=32: -D_MIPS_SZPTR=32} \
+ +%{mabi=n32: -D_MIPS_SZPTR=32} \
+ +%{mabi=64: -D_MIPS_SZPTR=64} \
+ +%{!mabi*: -D_MIPS_SZPTR=32} \
+ +%{!mips*: -U__mips -D__mips} \
+ +%{mabi=32: -U__mips64} \
+ +%{mabi=n32: -D__mips64} \
+ +%{mabi=64: -U__mips64} \
+ +%{!mabi*: -U__mips64} \
+ +%{fno-PIC:-U__PIC__ -U__pic__} %{fno-pic:-U__PIC__ -U__pic__} \
+ +%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \
+ +%{pthread:-D_REENTRANT}"
+ +
+  /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
+     the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
+     provides part of the support for getting C++ file-scope static
+ @@ -55,9 +145,18 @@ Boston, MA 02111-1307, USA.  */
+  #undef MIPS_DEFAULT_GVALUE
+  #define MIPS_DEFAULT_GVALUE 0
+  
+ +#undef LIB_SPEC
+ +/* Taken from sparc/linux.h.  */
+ +#define LIB_SPEC \
+ +  "%{shared: -lc} \
+ +   %{!shared: %{mieee-fp:-lieee} %{pthread:-lpthread} \
+ +     %{profile:-lc_p} %{!profile: -lc}}"
+ +
+  /* Borrowed from sparc/linux.h */
+  #undef LINK_SPEC
+ -#define LINK_SPEC "-Y P,/usr/lib %{shared:-shared} \
+ +#define LINK_SPEC \
+ + "%(endian_spec) \
+ +  %{shared:-shared} \
+    %{!shared: \
+      %{!ibcs: \
+        %{!static: \
+ @@ -67,33 +166,7 @@ Boston, MA 02111-1307, USA.  */
+  
+  
+  #undef SUBTARGET_ASM_SPEC
+ -#define SUBTARGET_ASM_SPEC "-KPIC"
+ -
+ -/* Undefine the following which were defined in elf.h.  This will cause the linux
+ -   port to continue to use collect2 for constructors/destructors.  These may be removed
+ -   when .ctor/.dtor section support is desired. */
+ -
+ -#undef CTORS_SECTION_ASM_OP
+ -#undef DTORS_SECTION_ASM_OP
+ -
+ -#undef EXTRA_SECTIONS
+ -#define EXTRA_SECTIONS in_sdata, in_rdata
+ -
+ -#undef INVOKE__main
+ -#undef NAME__MAIN
+ -#undef SYMBOL__MAIN
+ -
+ -#undef EXTRA_SECTION_FUNCTIONS
+ -#define EXTRA_SECTION_FUNCTIONS                                         \
+ -  SECTION_FUNCTION_TEMPLATE(sdata_section, in_sdata, SDATA_SECTION_ASM_OP) \
+ -  SECTION_FUNCTION_TEMPLATE(rdata_section, in_rdata, RDATA_SECTION_ASM_OP)
+ -
+ -#undef ASM_OUTPUT_CONSTRUCTOR
+ -#undef ASM_OUTPUT_DESTRUCTOR
+ -
+ -#undef CTOR_LIST_BEGIN
+ -#undef CTOR_LIST_END
+ -#undef DTOR_LIST_BEGIN
+ -#undef DTOR_LIST_END
+ -
+ -/*  End of undefines to turn off .ctor/.dtor section support */
+ +#define SUBTARGET_ASM_SPEC "\
+ +%{mabi=64: -64} \
+ +%{!fno-PIC:%{!fno-pic:-KPIC}} \
+ +%{fno-PIC:-non_shared} %{fno-pic:-non_shared}"
+ diff -up --recursive --new-file gcc-2.95.2.macro/gcc/config/mips/mips.h gcc-2.95.2/gcc/config/mips/mips.h
+ --- gcc-2.95.2.macro/gcc/config/mips/mips.h	Wed May 19 23:05:45 1999
+ +++ gcc-2.95.2/gcc/config/mips/mips.h	Tue Aug 15 18:40:42 2000
+ @@ -599,11 +599,11 @@ extern void		mips_select_section ();
+     linker will default to using big-endian output files.  The OUTPUT_FORMAT
+     line must be in the linker script, otherwise -EB/-EL will not work.  */
+  
+ -#ifndef LINKER_ENDIAN_SPEC
+ +#ifndef ENDIAN_SPEC
+  #if TARGET_ENDIAN_DEFAULT == 0
+ -#define LINKER_ENDIAN_SPEC "%{!EB:%{!meb:-EL}}"
+ +#define ENDIAN_SPEC "%{!EB:%{!meb:-EL}} %{EL} %{EB}"
+  #else
+ -#define LINKER_ENDIAN_SPEC ""
+ +#define ENDIAN_SPEC "%{!EL:%{!mel:-EB}} %{EB} %{EL}"
+  #endif
+  #endif
+  
+ @@ -871,7 +871,8 @@ while (0)
+  /* ASM_SPEC is the set of arguments to pass to the assembler.  */
+  
+  #define ASM_SPEC "\
+ -%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} %{mips4} \
+ +%(endian_spec) \
+ +%{G*} %{mips1} %{mips2} %{mips3} %{mips4} \
+  %{mips16:%{!mno-mips16:-mips16}} %{mno-mips16:-no-mips16} \
+  %(subtarget_asm_optimizing_spec) \
+  %(subtarget_asm_debugging_spec) \
+ @@ -925,9 +926,9 @@ while (0)
+  
+  #ifndef LINK_SPEC
+  #define LINK_SPEC "\
+ -%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} %{mips4} \
+ -%{bestGnum} %{shared} %{non_shared} \
+ -%(linker_endian_spec)"
+ +%(endian_spec) \
+ +%{G*} %{mips1} %{mips2} %{mips3} %{mips4} \
+ +%{bestGnum} %{shared} %{non_shared}"
+  #endif	/* LINK_SPEC defined */
+  
+  /* Specs for the compiler proper */
+ @@ -1035,7 +1036,7 @@ while (0)
+    { "subtarget_asm_optimizing_spec", SUBTARGET_ASM_OPTIMIZING_SPEC },	\
+    { "subtarget_asm_debugging_spec", SUBTARGET_ASM_DEBUGGING_SPEC },	\
+    { "subtarget_asm_spec", SUBTARGET_ASM_SPEC },				\
+ -  { "linker_endian_spec", LINKER_ENDIAN_SPEC },				\
+ +  { "endian_spec", ENDIAN_SPEC },					\
+    SUBTARGET_EXTRA_SPECS
+  
+  #ifndef SUBTARGET_EXTRA_SPECS
+ diff -up --recursive --new-file gcc-2.95.2.macro/gcc/configure.in gcc-2.95.2/gcc/configure.in
+ --- gcc-2.95.2.macro/gcc/configure.in	Wed Oct 13 07:58:02 1999
+ +++ gcc-2.95.2/gcc/configure.in	Mon May 29 22:16:31 2000
+ @@ -2356,16 +2356,23 @@ changequote([,])dnl
+  		# On NetBSD, the headers are already okay, except for math.h.
+  		tmake_file=t-netbsd
+  		;;
+ -       mips*-*-linux*)                         # Linux MIPS, either endian.
+ +	mips*-*-linux*)				# Linux MIPS, either endian.
+  		xmake_file=x-linux
+ -		xm_file="xm-siglist.h ${xm_file}"
+ -               case $machine in
+ -                       mipsel-*)  tm_file="mips/elfl.h mips/linux.h" ;;
+ -                       *)         tm_file="mips/elf.h mips/linux.h" ;;
+ -               esac
+ -		extra_parts="crtbegin.o crtend.o"
+ +		case $machine in
+ +			mips*el-*)
+ +				tm_file="mips/elfl.h mips/linux.h"
+ +				;;
+ +			*)
+ +				tm_file="mips/elf.h mips/linux.h"
+ +				;;
+ +		esac
+ +		tmake_file=t-linux
+ +		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+  		gnu_ld=yes
+  		gas=yes
+ +		if test x$enable_threads = xyes; then
+ +			thread_file='posix'
+ +		fi
+  		;;
+  	mips*el-*-openbsd*)	# mips little endian
+  		target_cpu_default="MASK_GAS|MASK_ABICALLS"
*** debian/patches/gcc-mips-linux-abi.dpatch~	Thu Nov 23 22:21:46 2000
--- debian/patches/gcc-mips-linux-abi.dpatch	Sun Dec 31 17:11:38 2000
***************
*** 0 ****
--- 1,50 ----
+ #! /bin/sh -e
+ 
+ if [ $# -eq 3 -a "$2" = '-d' ]; then
+     pdir="-d $3"
+ elif [ $# -ne 1 ]; then
+     echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+     exit 1
+ fi
+ case "$1" in
+     -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;;
+     -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;;
+     *)
+ 	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ 	exit 1
+ esac
+ exit 0
+ 
+ 
+ From ralf@gnu.org Mon Oct 30 11:51:34 2000
+ Message-ID: <20001029163828.A18989@bacchus.dhis.org>
+ Date: Sun, 29 Oct 2000 16:38:28 +0100
+ From: Ralf Baechle <ralf@gnu.org>
+ To: gcc@gcc.gnu.org
+ Cc: "Maciej W. Rozycki" <macro@ds2.pg.gda.pl>, Andreas Jaeger <aj@suse.de>,
+     Keith M Wesolowski <wesolows@foobazco.org>,
+     Ulf Carlsson <ulfc@engr.sgi.com>
+ Subject: PATCH: Linux/MIPS CPP_SPECs fix.
+ 
+ mips{,el}-linux default to the 32 bit ABI but we were predefining _ABIN32
+ indicating we're N32.  Below patch fixes this.  Please apply,
+ 
+   Ralf
+ 
+ 2000-10-29  Ralf Baechle <ralf@gnu.org>
+ 
+         * config/mips/linux.h (SUBTARGET_CPP_SPEC): Default ABI is 32; change
+         SUBTARGET_CPP_SPEC apropriatly.
+ 
+ diff -urN gcc-cygnus/gcc/config/mips/linux.h gcc/gcc/config/mips/linux.h
+ --- gcc-cygnus/gcc/config/mips/linux.h	Tue Aug 29 02:46:28 2000
+ +++ gcc/gcc/config/mips/linux.h	Sun Oct 29 16:32:55 2000
+ @@ -99,7 +99,7 @@
+  %{mabi=32: -D_MIPS_SIM=_MIPS_SIM_ABI32}	\
+  %{mabi=n32: -D_ABIN32=2 -D_MIPS_SIM=_ABIN32} \
+  %{mabi=64: -D_ABI64=3 -D_MIPS_SIM=_ABI64} \
+ -%{!mabi*: -D_ABIN32=2 -D_MIPS_SIM=_ABIN32} \
+ +%{!mabi*: -D_MIPS_SIM=_MIPS_SIM_ABI32}	\
+  %{!mint64: -D_MIPS_SZINT=32}%{mint64: -D_MIPS_SZINT=64} \
+  %{mabi=32: -D_MIPS_SZLONG=32} \
+  %{mabi=n32: -D_MIPS_SZLONG=32} \
*** debian/patches/gcc-mips-linux-ctors.dpatch~	Thu Nov 23 22:21:46 2000
--- debian/patches/gcc-mips-linux-ctors.dpatch	Sun Dec 31 17:11:51 2000
***************
*** 0 ****
--- 1,67 ----
+ #! /bin/sh -e
+ 
+ if [ $# -eq 3 -a "$2" = '-d' ]; then
+     pdir="-d $3"
+ elif [ $# -ne 1 ]; then
+     echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+     exit 1
+ fi
+ case "$1" in
+     -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;;
+     -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;;
+     *)
+ 	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ 	exit 1
+ esac
+ exit 0
+ 
+ diff -up --recursive --new-file gcc-2.95.2.macro/gcc/config/mips/linux.h gcc-2.95.2/gcc/config/mips/linux.h
+ --- gcc-2.95.2.macro/gcc/config/mips/linux.h	Thu Nov 16 07:25:03 2000
+ +++ gcc-2.95.2/gcc/config/mips/linux.h	Sat Nov 18 20:22:42 2000
+ @@ -170,3 +170,20 @@ Boston, MA 02111-1307, USA.  */
+  %{mabi=64: -64} \
+  %{!fno-PIC:%{!fno-pic:-KPIC}} \
+  %{fno-PIC:-non_shared} %{fno-pic:-non_shared}"
+ +
+ +/* On svr4, we *do* have support for the .init and .fini sections, and we
+ +   can put stuff in there to be executed before and after `main'.  We let
+ +   crtstuff.c and other files know this by defining the following symbols.
+ +   The definitions say how to change sections to the .init and .fini
+ +   sections.  This is the same for all known svr4 assemblers.  */
+ +
+ +#define INIT_SECTION_ASM_OP     "\t.section\t.init"
+ +#define FINI_SECTION_ASM_OP     "\t.section\t.fini"
+ +
+ +/* Undef junk imported from mips/elf.h.  */
+ +#undef CTOR_LIST_BEGIN
+ +#undef CTOR_LIST_END
+ +#undef DTOR_LIST_BEGIN
+ +#undef DTOR_LIST_END
+ +
+ +#undef INVOKE__main
+ diff -up --recursive --new-file gcc-2.95.2.macro/gcc/config/mips/mips.h gcc-2.95.2/gcc/config/mips/mips.h
+ --- gcc-2.95.2.macro/gcc/config/mips/mips.h	Tue Aug 15 18:40:42 2000
+ +++ gcc-2.95.2/gcc/config/mips/mips.h	Sat Nov 18 17:53:39 2000
+ @@ -1935,7 +1935,7 @@ extern enum reg_class mips_regno_to_clas
+  
+  extern enum reg_class mips_char_to_class[];
+  
+ -#define REG_CLASS_FROM_LETTER(C) mips_char_to_class[ (C) ]
+ +#define REG_CLASS_FROM_LETTER(C) mips_char_to_class[(unsigned char)(C)]
+  
+  /* The letters I, J, K, L, M, N, O, and P in a register constraint
+     string can be used to stand for particular ranges of immediate
+ diff -up --recursive --new-file gcc-2.95.2.macro/gcc/gcse.c gcc-2.95.2/gcc/gcse.c
+ --- gcc-2.95.2.macro/gcc/gcse.c	Sat Oct 16 21:20:32 1999
+ +++ gcc-2.95.2/gcc/gcse.c	Sat Nov 18 17:42:50 2000
+ @@ -1856,7 +1856,9 @@ hash_scan_set (pat, insn, set_p)
+  	  /* Don't GCSE something if we can't do a reg/reg copy.  */
+  	  && can_copy_p [GET_MODE (dest)]
+  	  /* Is SET_SRC something we want to gcse?  */
+ -	  && want_to_gcse_p (src))
+ +	  && want_to_gcse_p (src)
+ +	  /* Copy between modes is prohibited */
+ +	  && GET_MODE (src) == GET_MODE (dest))
+  	{
+  	  /* An expression is not anticipatable if its operands are
+  	     modified before this insn.  */
--- debian/rules.patch~	Sat Jan  6 14:41:43 2001
+++ debian/rules.patch	Sat Jan  6 14:43:28 2001
@@ -69,6 +69,9 @@
 ifeq ($(DEB_HOST_ARCH),m68k)
   debian_patches += 68060-build gcc-m68k-pic
 endif
+ifeq ($(DEB_HOST_ARCH),mips)
+  debian_patches += gcc-mips-linux gcc-mips-linux-abi gcc-mips-linux-ctors
+endif
 ifeq ($(DEB_HOST_ARCH),sparc)
   debian_patches += sparc32-rfi builtin-apply #sparc-bi-arch
 endif
--- debian/rules.defs~	Sun Jan  7 21:11:56 2001
+++ debian/rules.defs	Sun Jan  7 09:55:02 2001
@@ -97,7 +97,7 @@
 with_objc_gc := yes
 # disable ObjC garbage collection library (needs libgc5)
 ifneq ($(DEB_HOST_ARCH),i386)
-  ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),avr hurd-i386 m68k s390))
+  ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),avr hurd-i386 m68k mips s390))
     with_objc_gc := disabled for architecture $(DEB_HOST_ARCH)
   endif
 endif
@@ -109,7 +109,7 @@
 with_java := yes
 # build gcj only on architectures, where libgcj-2.95.1 can be built as well.
 ifneq ($(DEB_HOST_ARCH),i386)
-  ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),arm avr hurd-i386 m68k))
+  ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),arm avr hurd-i386 m68k mips))
     with_java := disabled for architecture $(DEB_HOST_ARCH)
   endif
 endif



Reply to: