xm-files: m68hc11

[Zack Weinberg]

xm-m68hc11.h unconditionally defines inhibit_libc.  This is Wrong.
I have assumed that m68hc11 is an exclusively cross target, and moved
the unconditional definition to m68hc11.h.  While I was at it I
converted the m68hc11 target headers to the new form (no recursive
#includes) and zapped a bunch of obsolete crap in m68hc11.h.

The config.gcc patch was edited out of a larger diff (see previous
message) and will therefore apply with offsets.

zw

===================================================================
Index: config.gcc
--- config.gcc	2001/03/16 04:39:20	1.43
+++ config.gcc	2001/03/16 21:37:16
@@ -1597,17 +1591,15 @@ m32r-*-elf*)
 	;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
-	tm_file="m68hc11/m68hc11.h"
-        xm_file="m68hc11/xm-m68hc11.h"
+	tm_file="elfos.h m68hc11/m68hc11.h"
 	tm_p_file="m68hc11/m68hc11-protos.h"
 	md_file="m68hc11/m68hc11.md"
 	out_file="m68hc11/m68hc11.c"
 	tmake_file="m68hc11/t-m68hc11-gas"
         ;;
 m68hc12-*-*|m6812-*-*)
-	tm_file="m68hc11/m68hc12.h"
+	tm_file="m68hc11/m68hc12.h elfos.h m68hc11/m68hc11.h"
 	tm_p_file="m68hc11/m68hc11-protos.h"
-        xm_file="m68hc11/xm-m68hc11.h"
 	md_file="m68hc11/m68hc11.md"
 	out_file="m68hc11/m68hc11.c"
 	tmake_file="m68hc11/t-m68hc11-gas"
===================================================================
Index: config/m68hc11/m68hc11.h
--- config/m68hc11/m68hc11.h	2001/01/01 20:35:30	1.4
+++ config/m68hc11/m68hc11.h	2001/03/16 21:37:17
@@ -33,18 +33,6 @@ Note:
 
 */
 
-#undef GCC_VERSION
-#if 1 /* def N_*/
-# define GCC_VERSION 2096
-#else
-# define GCC_VERSION 2095
-
-/* NLS support in 2.96 */
-# define N_(X) X
-#endif
-
-#include "elfos.h"
-
 /*****************************************************************************
 **
 ** Controlling the Compilation Driver, `gcc'
@@ -85,23 +73,10 @@ Note:
 
 /* Names to predefine in the preprocessor for this target machine.  */
 #define CPP_PREDEFINES		"-Dmc68hc1x"
-
-
-#ifndef IN_LIBGCC2
-#  include <stdio.h>
-#endif
 
-#include "gansidecl.h"
+/* As an embedded target, we have no libc.  */
+#define inhibit_libc
 
-#if GCC_VERSION == 2095
-#ifndef PARAMS
-#if defined(ANSI_PROTOTYPES) || defined(__cplusplus)
-#define PARAMS(args) args
-#else
-#define PARAMS(args) ()
-#endif
-#endif
-
 /* Forward type declaration for prototypes definitions.
    rtx_ptr is equivalent to rtx. Can't use the same name. */
 struct rtx_def;
@@ -1297,11 +1272,7 @@ extern enum reg_class m68hc11_index_reg_
 
 
 /* Internal macro, return 1 if REGNO is a valid base register.  */
-#if GCC_VERSION == 2095
-# define REG_VALID_P(REGNO) ((REGNO) >= 0)
-#else
-# define REG_VALID_P(REGNO) (1)	/* ? */
-#endif
+#define REG_VALID_P(REGNO) (1)	/* ? */
 
 extern unsigned char m68hc11_reg_valid_for_base[FIRST_PSEUDO_REGISTER];
 #define REG_VALID_FOR_BASE_P(REGNO) \
@@ -1882,14 +1853,3 @@ extern int debug_m6811;
 extern int z_replacement_completed;
 extern int current_function_interrupt;
 extern int current_function_trap;
-
-#if GCC_VERSION == 2095
-extern rtx_ptr iy_reg;
-extern rtx_ptr iy_reg;
-extern rtx_ptr d_reg;
-extern rtx_ptr m68hc11_soft_tmp_reg;
-extern rtx_ptr m68hc11_compare_op0;
-extern rtx_ptr m68hc11_compare_op1;
-extern long m68hc11_min_offset;
-extern long m68hc11_max_offset;
-#endif
===================================================================
Index: config/m68hc11/m68hc12.h
--- config/m68hc11/m68hc12.h	2000/09/08 20:54:44	1.1
+++ config/m68hc11/m68hc12.h	2001/03/16 21:37:17
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler, for m68hc12.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Stephane Carrez (stcarrez@worldnet.fr).
 
 This file is part of GNU CC.
@@ -38,6 +38,3 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_DEFAULT		(MASK_M6812)
 
 #define TARGET_M68HC12
-
-#include "m68hc11/m68hc11.h"
-
===================================================================
Index: config/m68hc11/xm-m68hc11.h
--- config/m68hc11/xm-m68hc11.h	Fri Mar 16 13:37:19 2001
+++ config/m68hc11/xm-m68hc11.h	Tue May  5 13:32:27 1998
@@ -1,22 +0,0 @@
-/* Configuration for GNU C-compiler for Motorola 68HC11 and 68HC12.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   Contributed by Stephane Carrez (stcarrez@worldnet.fr)
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define inhibit_libc