Commit Graph

710 Commits

Author SHA1 Message Date
Daniel Jacobowitz 1277a9a0d3 * configure.ac (target_libraries): Move libgcc before libiberty.
* configure: Regenerated.
2007-02-13 21:33:14 +00:00
Paolo Bonzini b8c26111a4 2007-02-13 Paolo Bonzini <bonzini@gnu.org>
* configure: Regenerate again?
2007-02-13 16:23:20 +00:00
Paolo Bonzini 6c5ba33ae2 2007-02-13 Paolo Bonzini <bonzini@gnu.org>
* configure: Reapply PR30748 fix which was lost in the previous commit.
2007-02-13 14:46:13 +00:00
Daniel Jacobowitz 893220e040 PR bootstrap/30753
* configure.ac: Remove obsolete build / host tests.  Use AC_PROG_CC
	unconditionally.  Use AC_PROG_CXX.  Use ACX_TOOL_DIRS to find $prefix.
	* configure: Regenerated.
2007-02-13 14:40:31 +00:00
Paolo Bonzini 60800fb274 2007-02-10 Paolo Bonzini <bonzini@gnu.org>
* configure: Regenerate.
2007-02-10 12:50:23 +00:00
Daniel Jacobowitz df59407408 PR bootstrap/30748
* configure.ac: Correct syntax for Solaris ksh.
	* configure: Regenerated.
2007-02-09 22:35:45 +00:00
Paolo Bonzini e6659c0029 2007-02-09 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def: Sync with GCC.
	* Makefile.tpl: Sync with GCC.
	* Makefile.in: Regenerate.
	* configure: Regenerate.

	* config/acx.m4: Sync with GCC.
	* config/depstand.m4: Sync with GCC.
	* config/tls.m4: Sync with GCC.
2007-02-09 19:24:42 +00:00
Daniel Jacobowitz b58b6ee18f * Makefile.tpl (build_alias, host_alias, target_alias): Use
noncanonical equivalents.
	* configure.in: Rename to...
	* configure.ac: ...this.  Update AC_PREREQ.  Prevent error for
	AS_FOR_TARGET.  Set build_noncanonical, host_noncanonical, and
	target_noncanonical.  Use them.  Rewrite removal of configure
	arguments for autoconf 2.59.  Discard variable settings.  Force
	program_transform_name for native tools.

	* Makefile.in: Regenerated.
	* configure: Regenerated with autoconf 2.59.

	* src-release (DEVO_SUPPORT, do-proto-toplev): Expect configure.ac.

	* acx.m4 (ACX_CHECK_INSTALLED_TARGET_TOOL): Avoid AC_PATH_PROG
	with an empty path.
2007-02-09 15:15:38 +00:00
Jeff Johnston 981d5b2128 2007-02-08 Jeff Johnston <jjohnstn@redhat.com>
* COPYING.LIBGLOSS: Reformat default Red Hat
        license to fit within 80 columns.
        * COPYING.NEWLIB: Ditto.
2007-02-08 21:32:33 +00:00
Dave Brolley 4e16301e3d 2007-02-05 Dave Brolley <brolley@redhat.com>
* Contribute the following changes:
        2006-11-28  DJ Delorie  <dj@redhat.com>

        * configure.in: Fix typo for mep's target_makefile_frag.
        * configure: Regenerated.

        2005-04-22  Richard Sandiford  <rsandifo@redhat.com>

        * configure.in (mep*): Add -mlibrary to FLAGS_FOR_TARGET.
        * configure: Regenerate.

        2001-09-19  DJ Delorie  <dj@redhat.com>

        * configure.in (target_makefile_frag): use mt-mep

        2001-06-12  Don Howard  <dhoward@redhat.com>

        * configure.in: Remove gdb from MeP skip list.

        2001-04-05  DJ Delorie  <dj@redhat.com>

        * configure.in (noconfigdirs): Remove gcc from MeP skip list.

        2001-03-20  Ben Elliston  <bje@redhat.com>

        * configure.in (noconfigdirs): Add gcc and gdb for MeP.

        2001-03-19  Ben Elliston  <bje@redhat.com>

        * config.sub (mep, mep-*): Add.
2007-02-05 19:10:45 +00:00
Andreas Schwab 07846b16c6 * Makefile.tpl (LDFLAGS): Substitute it.
* Makefile.in: Regenerate.
2007-01-31 22:23:37 +00:00
Paolo Bonzini bd74ff2b2c 2007-01-11 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Change == to = in test command.
        * configure: Regenerate.

2007-01-11  Paolo Bonzini  <bonzini@gnu.org>

        * warnings.m4: Use m4_expand_once to clear the AC_SUBST'ed variable.
        (ACX_PROG_CC_WARNINGS_ARE_ERRORS): Fix typo.  Add optional 2nd argument.
2007-01-11 15:23:41 +00:00
Paolo Bonzini 42f55f77a8 2007-01-11 Paolo Bonzini <bonzini@gnu.org>
Nick Clifton  <nickc@redhat.com>
            Kaveh R. Ghazi  <ghazi@caip.rutgets.edu>

        * configure.in (build_configargs, host_configargs, target_configargs):
        Remove build/host/target parameters.
        (host_libs): Add gmp and mpfr.
        (GMP tests): Reorganize to allow in-tree GMP/MPFR.
        * Makefile.def (gmp, mpfr): New.
        (gcc): Remove target.
        * Makefile.tpl (build_os, build_vendor, host_os, host_vendor,
        target_os, target_vendor): New.
        (configure): Add host_alias/target_alias arguments.  Adjust invocations.
        * configure: Regenerate.
        * Makefile.in: Regenerate.

2007-01-11  Matt Fago  <fago@earthlink.net>

	* configure.in: Try to link to functions only in mpfr 2.2.x
        to improve robustness of configure tests.
	* configure: Regenerate.
2007-01-11 11:22:52 +00:00
Nick Clifton a1c408a120 * Makefile.tpl (all-target): Correct @if conditional for target modules.
* configure.in: Omit libiberty if building only target libgcc.
* configure, Makefile.in: Regenerated.
2007-01-09 14:09:57 +00:00
Nick Clifton d234d96e67 Mention that the top level configure file has been regenerated. 2007-01-09 07:40:34 +00:00
Nick Clifton ba5e3b3e06 * configure.in: Add support for an x86_64-mingw* target.
* configure: Regenerate.
2007-01-09 07:36:09 +00:00
Paolo Bonzini 48edcc3fcc 2007-01-04 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Use DEV-PHASE to detect the default for --enable-werror.
	* configure: Regenerate.
2007-01-04 09:12:28 +00:00
Daniel Jacobowitz 1f31615615 Sync with gcc:
* Makefile.def (target_modules): Add libgcc.
	(lang_env_dependencies): Remove default items.  Use no_c and no_gcc.
	* Makefile.tpl (clean-target-libgcc): Delete.
	(configure-target-[+module+]): Emit --disable-bootstrap dependencies
	on gcc even for bootstrapped modules.  Rewrite handling of
	lang_env_dependencies to loop over target_modules.
	* configure.in (target_libraries): Add target-libgcc.
	* Makefile.in, configure: Regenerated.
2007-01-04 04:32:36 +00:00
Paolo Bonzini 75ea5758cd 2006-12-29 Paolo Bonzini <bonzini@gnu.org>
Sync with gcc:
	2006-12-29  Paolo Bonzini  <bonzini@gnu.org>

        * configure.in: Reorganize recognition of languages.  Add
        --enable-stage1-languages.  Show supported languages for the chosen
        target rather than all recognized languages.
        * configure: Regenerate.

	2006-12-29  Paolo Bonzini  <bonzini@gnu.org>

        * Makefile.tpl (GCC_STRAP_TARGETS, all-prebootstrap): Remove.
        * Makefile.in: Regenerate.

	2006-12-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

        * configure.in: Warn that MPFR 2.2.0 is buggy.
        * configure: Regenerate.

config:
2006-12-29  Paolo Bonzini  <bonzini@gnu.org>

	* acx.m4: Sync with gcc.
2006-12-29 17:09:59 +00:00
Ian Lance Taylor bde7f6652d * configure.in: When removing Makefiles to force a reconfigure, also
remove prev-DIR*/Makefile.
	* configure: Regenerate.
2006-12-27 23:46:00 +00:00
Kazu Hirata 14a52a8ec7 bfd/
* config.bfd: Recognize fido.

gas/
	* configure.tgt: Recognize fido.

ld/
	* configure.tgt: Recognize fido.
2006-12-24 02:48:58 +00:00
Paolo Bonzini 14a1406e83 2006-12-19 Paolo Bonzini <bonzini@gnu.org>
Sync with gcc:

	2006-12-19  Paolo Bonzini  <bonzini@gnu.org>

	* configure.in: Remove "$build" case for powerpc-*-darwin* since
	it only affects bootstrap and could be tested on "$host" as well.
	* configure: Regenerate.
	* config/mh-ppc-darwin: Add to the stage1 cflags here.

	2006-12-19  Paolo Bonzini  <bonzini@gnu.org>

	PR bootstrap/29544
	* Makefile.def (flags_to_pass): Add STAGE1_CHECKING.
	(bootstrap_stage): Add STAGE1_CHECKING to stage1 configure flags,
	move here comment from Makefile.tpl.
	* Makefile.tpl: Move some definitions higher in the file.
	(STAGE1_CHECKING): New.
	* configure.in: Add --enable-stage1-checking.
	* configure: Regenerate.
	* Makefile.in: Regenerate.

	2006-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* configure.in: Update error message for missing GMP/MPFR.

	* configure: Regenerate.

	2006-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* configure.in: Update MPFR version in error message.

	* configure: Regenerate.

	2006-11-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* configure.in (--with-mpfr-dir, --with-gmp-dir): Remove flags.
	(--with-mpfr-include, --with-mpfr-lib, --with-gmp-include,
	--with-gmp-lib): New flags.

	* configure: Regenerate.

config:
2006-12-04  Eric Botcazou  <ebotcazou@libertysurf.fr>

	* tls.m4 (GCC_CHECK_TLS): Do not test TLS with static linking
	if static linking doesn't even work.
2006-12-19 12:52:58 +00:00
Alan Modra 8470d6bc0e sync a change from gcc 2006-12-12 01:38:04 +00:00
Alan Modra e53c5df0a1 * configure.in: Handle spu makefile frag.
* config/mt-spu: New file.
	* Makefile.tpl (MAINT): Define
	(MAINTAINER_MODE_FALSE, MAINTAINER_MODE_TRUE): Define.
	* configure: Regenerate.
	* Makefile.in: Regenerate.
2006-12-11 06:47:57 +00:00
Ben Elliston 18bff3e03b * config.sub, config.guess: Update from upstream sources. 2006-12-11 04:12:46 +00:00
Ben Elliston 3fce2c7f21 * configure.in: Sync with GCC (spu-*-*).
* configure: Sync with GCC.
2006-12-11 00:25:59 +00:00
Mike Stump da6b5ab61f * Makefile.def (dependencies): Add dependency for
install-target-libssp and install-target-libgomp on
        install-gcc.
        * Makefile.in: Regenerate.
2006-12-08 21:05:25 +00:00
Paolo Bonzini 0b66ef4c9d 2006-11-16 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (clean-target-libgcc): Test for gcc Makefile presence.
	(unstage): Test for stage_last presence.

	PR bootstrap/29802
	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Add HOST_SUBDIR in STAGE_PREFIX.
	* Makefile.in: Regenerate.
2006-11-17 10:35:45 +00:00
DJ Delorie a6a4e782ff * Makefile.tpl (clean-stage*): Sync with GCC (clean).
* Makefile.in: Sync with GCC.
* configure.in: Sync with GCC (mpfr, gmp).
* configure: Sync with GCC.
2006-11-14 23:26:39 +00:00
Jeff Johnston 2d579e01f4 2006-11-08 Jie Zhang <jie.zhang@analog.com>
* configure.in: Remove target-libgloss from noconfigdirs for
        bfin-*-*.
        * configure: Regenerated.
2006-11-09 16:25:54 +00:00
Jeff Johnston c9916d6558 2006-10-27 Jeff Johnston <jjohnstn@redhat.com>
* COPYING.NEWLIB: Add spu license.
        * COPYING.LIBGLOSS: Ditto.
2006-10-27 23:00:35 +00:00
Jeff Johnston 6457e1a638 2006-10-27 Jeff Johnston <jjohnstn@redhat.com>
* COPYING.NEWLIB: Add spu license.
2006-10-27 22:57:03 +00:00
DJ Delorie 39bbbb6969 2006-10-17 Brooks Moses <bmoses@stanford.edu>
* Makefile.def: Added pdf target handling.
* Makefile.tpl: Added pdf target handling.
* Makefile.in: Regenerated.
2006-10-17 04:23:49 +00:00
Jeff Johnston b8c30b54c7 2006-10-11 Jeff Johnston <jjohnstn@redhat.com>
* COPYING.NEWLIB: Updated.
        * COPYING.LIBGLOSS: Ditto.
2006-10-11 19:30:34 +00:00
Dave Brolley adb51f0a91 2006-09-27 Dave Brolley <brolley@redhat.com>
* configure.in (RUNTEST): Look for 'runtest' in the source tree by using
        $s instead of $r.
        * configure: Regenerated.
2006-09-27 16:20:49 +00:00
Ben Elliston 477192898e * config.sub, config.guess: Update from upstream sources. 2006-09-26 05:22:50 +00:00
Thiemo Seufer 70f1ec33cb * configure.in: Remove redundant handling of mips*-dec-bsd*. Likewise
for mipstx39-*-*. Disable libgloss for mips64*-*-linux*.
	* configure: Regenerate.
2006-09-20 12:33:49 +00:00
Corinna Vinschen bc6686654c * configure.in: Never build newlib for a Mingw host.
Never build newlib as Mingw target library.
	Test the existence of winsup/cygwin for building a Cygwin newlib,
	rather than just winsup.
	Add winsup/mingw and winsup/w32api paths to FLAGS_FOR_TARGET if
	building a Mingw target.
	* configure: Regenerate.
2006-08-30 13:14:18 +00:00
Thiemo Seufer 8216dda89f [ ChangeLog ]
* config.sub: Add support for sde as alias of mipsisa32-sde-elf.

	[ bfd/ChangeLog ]
	* config.bfd: Add configurations for mips*el-sde-elf* and
	mips*-sde-elf*.

	[ binutils/testsuite/ChangeLog ]
	* binutils-all/readelf.exp (readelf_test): Handle mips*-sde-elf*.

	[ gas/ChangeLog ]
	* configure.tgt: Handle mips*-sde-elf*.

	[ gas/testsuite/ChangeLog ]
	* gas/mips/mips.exp: Handle mips*-sde-elf*.
2006-08-15 18:23:07 +00:00
Paolo Bonzini c684482df7 Sync from GCC
2006-07-04  Eric Botcazou  <ebotcazou@libertysurf.fr>

        PR bootstrap/18058
        * configure.in: Add -fkeep-inline-functions to CFLAGS for stage 1
        if the bootstrap compiler is a GCC version that supports it.
        * configure: Regenerate.

config:
2006-07-21  David Daney  <ddaney@avtrex.com>

        PR libgcj/28426
        * gxx-include-dir.m4: Use target_alias in path for cross build.
2006-07-25 08:39:57 +00:00
Daniel Jacobowitz 3160f998c5 * configure.in: Allow mingw32 and cygwin targets to build cross-gdb.
* configure: Regenerated.
gdb/
	* config/i386/cygwin.mt (DEPRECATED_TM_FILE): Delete.
	* config/i386/nm-cygwin.h: Add contents of tm-cygwin.h.
	* config/i386/tm-cygwin.h: Delete file.
2006-07-23 03:47:43 +00:00
Paolo Bonzini 380e48e5f8 2006-07-19 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-stageN-MODULE): Pass --with-build-libsubdir
	for stages after the first.
	* Makefile.in: Regenerate.

config:
2006-07-19  Paolo Bonzini  <bonzini@gnu.org>

	* acx.m4: Support --with-build-libsubdir and AC_SUBST
	build_libsubdir.
2006-07-19 17:06:06 +00:00
Jakub Jelinek b04b2e6b6d * Makefile.def: Add dependencies for configure-opcodes
on configure-intl and all-opcodes on all-intl.
	* Makefile.in: Regenerated.
2006-07-17 17:04:21 +00:00
Alexandre Oliva e51ac1a2bf ChangeLog:
* ltconfig: chmod 644 before ranlib during install.
libiberty/ChangeLog:
* Makefile.in: chmod 644 before ranlib during install.
2006-07-04 20:31:03 +00:00
Paolo Bonzini 37b43cde0c 2006-07-03 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Fix thinkos in previous check-in.
	* configure: Regenerate.
2006-07-03 11:22:03 +00:00
Paolo Bonzini 69d5f3329f 2006-07-03 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Fix thinko in previous check-in.
	* configure: Regenerate.
2006-07-03 09:26:24 +00:00
Paolo Bonzini f90716dddf 2006-07-03 Paolo Bonzini <bonzini@gnu.org>
Sync from gcc:

	2007-07-03  Paolo Bonzini  <bonzini@gnu.org>

	PR other/27063
	* configure.in: Test subdir_requires and give an appropriate
	error message.
	* configure: Regenerate.

	2006-06-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	PR target/27540
	* configure.in: Only enable libgomp on IRIX 6.
	* configure: Regenerate.
2006-07-03 07:58:12 +00:00
David Ayers 09fd280ca4 2006-06-20 David Ayers <d.ayers@inode.at>
PR bootstrap/28072
	* configure.in: Add target-boehm-gc to noconfigdirs depending on
	whether target-libjava is being configured instead of whether the
	java front end is enabled.
	* configure: Regenerate.
2006-06-20 08:45:35 +00:00
Mark Shinwell dac1814fbe * include/elf/arm.h: Correct names of R_ARM_LDC_G{0,1,2}
to R_ARM_LDC_SB_G{0,1,2} respectively.

bfd/
	* bfd-in2.h: Regenerate.
	* elf32-arm.c (R_ARM_ALU_PC_G0_NC, R_ARM_ALU_PC_G0,
	R_ARM_ALU_PC_G1_NC, R_ARM_ALU_PC_G1, R_ARM_ALU_PC_G2,
	R_ARM_LDR_PC_G1, R_ARM_LDR_PC_G2, R_ARM_LDRS_PC_G0,
	R_ARM_LDRS_PC_G1, R_ARM_LDRS_PC_G2, R_ARM_LDC_PC_G0,
	R_ARM_LDC_PC_G1, R_ARM_LDC_PC_G2, R_ARM_ALU_SB_G0_NC,
	R_ARM_ALU_SB_G0, R_ARM_ALU_SB_G1_NC, R_ARM_ALU_SB_G1,
	R_ARM_ALU_SB_G2, R_ARM_LDR_SB_G0, R_ARM_LDR_SB_G1,
	R_ARM_LDR_SB_G2, R_ARM_LDRS_SB_G0, R_ARM_LDRS_SB_G1,
	R_ARM_LDRS_SB_G2, R_ARM_LDC_SB_G0, R_ARM_LDC_SB_G1,
	R_ARM_LDC_SB_G2): New relocation types.
	(R_ARM_PC13): Rename to AAELF name R_ARM_LDR_PC_G0 and
	adjust HOWTO entry to be consistent with R_ARM_LDR_PC_G1
	and friends.
	(elf32_arm_howto_table_3): Delete; contents merged into
	elf32_arm_howto_table_2.
	(elf32_arm_howto_from_type): Adjust correspondingly.
	(elf32_arm_reloc_map): Extend with the above relocations.
	(calculate_group_reloc_mask): New function.
	(identify_add_or_sub): New function.
	(elf32_arm_final_link_relocate): Support for the above
	relocations.
	* reloc.c: Add enumeration entries for BFD_RELOC_ARM_...
	codes to correspond to the above relocations.

gas/
	* config/tc-arm.c (enum parse_operand_result): New.
	(struct group_reloc_table_entry): New.
	(enum group_reloc_type): New.
	(group_reloc_table): New array.
	(find_group_reloc_table_entry): New function.
	(parse_shifter_operand_group_reloc): New function.
	(parse_address_main): New function, incorporating code
	from the old parse_address function.  To be used via...
	(parse_address): wrapper for parse_address_main; and
	(parse_address_group_reloc): new function, likewise.
	(enum operand_parse_code): New codes OP_SHG, OP_ADDRGLDR,
	OP_ADDRGLDRS, OP_ADDRGLDC.
	(parse_operands): Support for these new operand codes.
	New macro po_misc_or_fail_no_backtrack.
	(encode_arm_cp_address): Preserve group relocations.
	(insns): Modify to use the above operand codes where group
	relocations are permitted.
	(md_apply_fix): Handle the group relocations
	ALU_PC_G0_NC through LDC_SB_G2.
	(tc_gen_reloc): Likewise.
	(arm_force_relocation): Leave group relocations for the linker.
	(arm_fix_adjustable): Likewise.

gas/testsuite/
	* gas/arm/group-reloc-alu.d: New test.
	* gas/arm/group-reloc-alu-encoding-bad.d: New test.
	* gas/arm/group-reloc-alu-encoding-bad.l: New test.
	* gas/arm/group-reloc-alu-encoding-bad.s: New test.
	* gas/arm/group-reloc-alu-parsing-bad.d: New test.
	* gas/arm/group-reloc-alu-parsing-bad.l: New test.
	* gas/arm/group-reloc-alu-parsing-bad.s: New test.
	* gas/arm/group-reloc-alu.s: New test.
	* gas/arm/group-reloc-ldc.d: New test.
	* gas/arm/group-reloc-ldc-encoding-bad.d: New test.
	* gas/arm/group-reloc-ldc-encoding-bad.l: New test.
	* gas/arm/group-reloc-ldc-encoding-bad.s: New test.
	* gas/arm/group-reloc-ldc-parsing-bad.d: New test.
	* gas/arm/group-reloc-ldc-parsing-bad.l: New test.
	* gas/arm/group-reloc-ldc-parsing-bad.s: New test.
	* gas/arm/group-reloc-ldc.s: New test.
	* gas/arm/group-reloc-ldr.d: New test.
	* gas/arm/group-reloc-ldr-encoding-bad.d: New test.
	* gas/arm/group-reloc-ldr-encoding-bad.l: New test.
	* gas/arm/group-reloc-ldr-encoding-bad.s: New test.
	* gas/arm/group-reloc-ldr-parsing-bad.d: New test.
	* gas/arm/group-reloc-ldr-parsing-bad.l: New test.
	* gas/arm/group-reloc-ldr-parsing-bad.s: New test.
	* gas/arm/group-reloc-ldr.s: New test.
	* gas/arm/group-reloc-ldrs.d: New test.
	* gas/arm/group-reloc-ldrs-encoding-bad.d: New test.
	* gas/arm/group-reloc-ldrs-encoding-bad.l: New test.
	* gas/arm/group-reloc-ldrs-encoding-bad.s: New test.
	* gas/arm/group-reloc-ldrs-parsing-bad.d: New test.
	* gas/arm/group-reloc-ldrs-parsing-bad.l: New test.
	* gas/arm/group-reloc-ldrs-parsing-bad.s: New test.
	* gas/arm/group-reloc-ldrs.s: New test.

ld/testsuite/
	* ld-arm/group-relocs-alu-bad.d: New test.
	* ld-arm/group-relocs-alu-bad.s: New test.
	* ld-arm/group-relocs.d: New test.
	* ld-arm/group-relocs-ldc-bad.d: New test.
	* ld-arm/group-relocs-ldc-bad.s: New test.
	* ld-arm/group-relocs-ldr-bad.d: New test.
	* ld-arm/group-relocs-ldr-bad.s: New test.
	* ld-arm/group-relocs-ldrs-bad.d: New test.
	* ld-arm/group-relocs-ldrs-bad.s: New test.
	* ld-arm/group-relocs.s: New test.
	* ld-arm/arm-elf.exp: Wire in new tests.
2006-06-15 11:03:01 +00:00
Paolo Bonzini 59e0ff46b1 remove conflict indicators 2006-06-15 06:25:49 +00:00