diff mbox

Remove some unused gcc/config/ headers and .opt files

Message ID Pine.LNX.4.64.1102182332210.18510@digraph.polyomino.org.uk
State New
Headers show

Commit Message

Joseph Myers Feb. 18, 2011, 11:33 p.m. UTC
When going through all the gcc/config/ headers to check the specs
there for options needing adding to .opt files, I noticed a header I
thought might be unused.  Some further checks showed that at least
four gcc/config headers and at least one gcc/config .opt file are not
used by any configuration in config.gcc.  (The greps used were not a
fully rigorous process for identifying whether a header is used, so
there may be more.)

This patch removes three unused headers (the correct fix for the
fourth, i386/djgpp-stdint.h, is clearly to make the relevant
configuration use it rather than removing the header) and one unused
.opt file.

Bootstrapped with no regressions on x86_64-unknown-linux-gnu.  OK to
commit?

2011-02-18  Joseph Myers  <joseph@codesourcery.com>

	* config/i386/biarch32.h, config/i386/mach.h,
	config/rs6000/aix.opt, config/sh/superh64.h: Remove.

Comments

Richard Biener Feb. 19, 2011, 10:13 a.m. UTC | #1
On Sat, Feb 19, 2011 at 12:33 AM, Joseph S. Myers
<joseph@codesourcery.com> wrote:
> When going through all the gcc/config/ headers to check the specs
> there for options needing adding to .opt files, I noticed a header I
> thought might be unused.  Some further checks showed that at least
> four gcc/config headers and at least one gcc/config .opt file are not
> used by any configuration in config.gcc.  (The greps used were not a
> fully rigorous process for identifying whether a header is used, so
> there may be more.)
>
> This patch removes three unused headers (the correct fix for the
> fourth, i386/djgpp-stdint.h, is clearly to make the relevant
> configuration use it rather than removing the header) and one unused
> .opt file.
>
> Bootstrapped with no regressions on x86_64-unknown-linux-gnu.  OK to
> commit?

Ok.

Thanks,
Richard.

> 2011-02-18  Joseph Myers  <joseph@codesourcery.com>
>
>        * config/i386/biarch32.h, config/i386/mach.h,
>        config/rs6000/aix.opt, config/sh/superh64.h: Remove.
>
> Index: gcc/config/i386/biarch32.h
> ===================================================================
> --- gcc/config/i386/biarch32.h  (revision 170272)
> +++ gcc/config/i386/biarch32.h  (working copy)
> @@ -1,29 +0,0 @@
> -/* Make configure files to produce biarch compiler defaulting to 32bit mode.
> -   This file must be included very first, while the OS specific file later
> -   to overwrite otherwise wrong defaults.
> -   Copyright (C) 2009 Free Software Foundation, Inc.
> -   Contributed by Kai Tietz <kai.tietz@onevision.com>.
> -
> -This file is part of GCC.
> -
> -GCC 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 3, or (at your option)
> -any later version.
> -
> -GCC 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.
> -
> -Under Section 7 of GPL version 3, you are granted additional
> -permissions described in the GCC Runtime Library Exception, version
> -3.1, as published by the Free Software Foundation.
> -
> -You should have received a copy of the GNU General Public License and
> -a copy of the GCC Runtime Library Exception along with this program;
> -see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
> -<http://www.gnu.org/licenses/>.  */
> -
> -#define TARGET_64BIT_DEFAULT 0
> -#define TARGET_BI_ARCH 1
> Index: gcc/config/i386/mach.h
> ===================================================================
> --- gcc/config/i386/mach.h      (revision 170272)
> +++ gcc/config/i386/mach.h      (working copy)
> @@ -1,44 +0,0 @@
> -/* Configuration for an i386 running Mach as the target machine.
> -
> -Copyright (C) 1992, 1993, 1997, 1998, 2000, 2001,
> -2002 Free Software Foundation, Inc.
> -
> -This file is part of GCC.
> -
> -GCC 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 3, or (at your option) any later
> -version.
> -
> -GCC 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.
> -
> -Under Section 7 of GPL version 3, you are granted additional
> -permissions described in the GCC Runtime Library Exception, version
> -3.1, as published by the Free Software Foundation.
> -
> -You should have received a copy of the GNU General Public License and
> -a copy of the GCC Runtime Library Exception along with this program;
> -see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
> -<http://www.gnu.org/licenses/>.  */
> -
> -#define TARGET_VERSION fprintf (stderr, " (80386, Mach)");
> -
> -#define TARGET_OS_CPP_BUILTINS()               \
> -  do                                           \
> -    {                                          \
> -       builtin_define_std ("unix");            \
> -       builtin_define_std ("MACH");            \
> -       builtin_assert ("system=unix");         \
> -       builtin_assert ("system=mach");         \
> -    }                                          \
> -  while (0)
> -
> -/* Specify extra dir to search for include files.  */
> -#define SYSTEM_INCLUDE_DIR "/usr/mach/include"
> -
> -/* Don't default to pcc-struct-return, because gcc is the only compiler, and
> -   we want to retain compatibility with older gcc versions.  */
> -#define DEFAULT_PCC_STRUCT_RETURN 0
> Index: gcc/config/sh/superh64.h
> ===================================================================
> --- gcc/config/sh/superh64.h    (revision 170272)
> +++ gcc/config/sh/superh64.h    (working copy)
> @@ -1,49 +0,0 @@
> -/*
> - Definitions of target machine for gcc for SuperH using target sh-superh-elf,
> -
> -   Copyright 2000, 2007 Free Software Foundation, Inc.
> -   Contributed by Alexandre Oliva <aoliva@redhat.com>
> -   Modified for SuperH by Richard Shann
> -
> -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 3, 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 GCC; see the file COPYING3.  If not see
> -<http://www.gnu.org/licenses/>.  */
> -
> -/* This header file is used when the vendor name is set to 'superh'.
> -   It configures the compiler for SH5 only and switches the default
> -   endianess to little.
> -   This file is intended to override sh.h, superh.h and sh64.h (which
> -   should have been included in that order) */
> -
> -
> -#ifndef _SUPERH_H
> - #error superh64.h should not be used without superh.h
> -#endif
> -
> -/* We override TARGET_PROCESSOR_SWITCHES in order to remove all the unrequired cpu options */
> -#undef TARGET_PROCESSOR_SWITCHES
> -#define TARGET_PROCESSOR_SWITCHES                      \
> -  {"5-64media",        TARGET_NONE, "" },              \
> -  {"5-64media", SELECT_SH5_64, "SH5 64-bit SHmedia code" }, \
> -  {"5-64media-nofpu", TARGET_NONE, "" },       \
> -  {"5-64media-nofpu", SELECT_SH5_64_NOFPU, "SH5 64-bit FPU-less SHmedia code" }, \
> -  {"5-32media",        TARGET_NONE, "" },              \
> -  {"5-32media", SELECT_SH5_32, "SH5 32-bit SHmedia code" }, \
> -  {"5-32media-nofpu", TARGET_NONE, "" },       \
> -  {"5-32media-nofpu", SELECT_SH5_32_NOFPU, "SH5 32-bit FPU-less SHmedia code" }, \
> -  {"5-compact",        TARGET_NONE, "" },              \
> -  {"5-compact",        SELECT_SH5_COMPACT, "SH5 SHcompact code" }, \
> -  {"5-compact-nofpu", TARGET_NONE, "" },       \
> -  {"5-compact-nofpu", SELECT_SH5_COMPACT_NOFPU, "SH5 FPU-less SHcompact code" }
> Index: gcc/config/rs6000/aix.opt
> ===================================================================
> --- gcc/config/rs6000/aix.opt   (revision 170272)
> +++ gcc/config/rs6000/aix.opt   (working copy)
> @@ -1,24 +0,0 @@
> -; AIX options.
> -;
> -; Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc.
> -; Contributed by Aldy Hernandez <aldy@quesejoda.com>.
> -;
> -; This file is part of GCC.
> -;
> -; GCC 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 3, or (at your option) any later
> -; version.
> -;
> -; GCC 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 GCC; see the file COPYING3.  If not see
> -; <http://www.gnu.org/licenses/>.
> -
> -mxl-compat
> -Target Var(has_xl_compat_option) Save
> -Conform more closely to IBM XLC semantics
>
> --
> Joseph S. Myers
> joseph@codesourcery.com
>
diff mbox

Patch

Index: gcc/config/i386/biarch32.h
===================================================================
--- gcc/config/i386/biarch32.h	(revision 170272)
+++ gcc/config/i386/biarch32.h	(working copy)
@@ -1,29 +0,0 @@ 
-/* Make configure files to produce biarch compiler defaulting to 32bit mode.
-   This file must be included very first, while the OS specific file later
-   to overwrite otherwise wrong defaults. 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Contributed by Kai Tietz <kai.tietz@onevision.com>.
-
-This file is part of GCC.
-
-GCC 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 3, or (at your option)
-any later version.
-
-GCC 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.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-#define TARGET_64BIT_DEFAULT 0
-#define TARGET_BI_ARCH 1
Index: gcc/config/i386/mach.h
===================================================================
--- gcc/config/i386/mach.h	(revision 170272)
+++ gcc/config/i386/mach.h	(working copy)
@@ -1,44 +0,0 @@ 
-/* Configuration for an i386 running Mach as the target machine.
-
-Copyright (C) 1992, 1993, 1997, 1998, 2000, 2001,
-2002 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC 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 3, or (at your option) any later
-version.
-
-GCC 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.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-#define TARGET_VERSION fprintf (stderr, " (80386, Mach)"); 
-
-#define TARGET_OS_CPP_BUILTINS()		\
-  do						\
-    {						\
-	builtin_define_std ("unix");		\
-	builtin_define_std ("MACH");		\
-	builtin_assert ("system=unix");		\
-	builtin_assert ("system=mach");		\
-    }						\
-  while (0)
-
-/* Specify extra dir to search for include files.  */
-#define SYSTEM_INCLUDE_DIR "/usr/mach/include"
-
-/* Don't default to pcc-struct-return, because gcc is the only compiler, and
-   we want to retain compatibility with older gcc versions.  */
-#define DEFAULT_PCC_STRUCT_RETURN 0
Index: gcc/config/sh/superh64.h
===================================================================
--- gcc/config/sh/superh64.h	(revision 170272)
+++ gcc/config/sh/superh64.h	(working copy)
@@ -1,49 +0,0 @@ 
-/* 
- Definitions of target machine for gcc for SuperH using target sh-superh-elf,
- 
-   Copyright 2000, 2007 Free Software Foundation, Inc.
-   Contributed by Alexandre Oliva <aoliva@redhat.com>
-   Modified for SuperH by Richard Shann
-
-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 3, 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 GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-/* This header file is used when the vendor name is set to 'superh'.
-   It configures the compiler for SH5 only and switches the default
-   endianess to little.
-   This file is intended to override sh.h, superh.h and sh64.h (which
-   should have been included in that order) */
-
-
-#ifndef _SUPERH_H
- #error superh64.h should not be used without superh.h
-#endif
-
-/* We override TARGET_PROCESSOR_SWITCHES in order to remove all the unrequired cpu options */
-#undef TARGET_PROCESSOR_SWITCHES
-#define TARGET_PROCESSOR_SWITCHES  			\
-  {"5-64media",	TARGET_NONE, "" },		\
-  {"5-64media", SELECT_SH5_64, "SH5 64-bit SHmedia code" }, \
-  {"5-64media-nofpu", TARGET_NONE, "" },	\
-  {"5-64media-nofpu", SELECT_SH5_64_NOFPU, "SH5 64-bit FPU-less SHmedia code" }, \
-  {"5-32media",	TARGET_NONE, "" },		\
-  {"5-32media", SELECT_SH5_32, "SH5 32-bit SHmedia code" }, \
-  {"5-32media-nofpu", TARGET_NONE, "" },	\
-  {"5-32media-nofpu", SELECT_SH5_32_NOFPU, "SH5 32-bit FPU-less SHmedia code" }, \
-  {"5-compact",	TARGET_NONE, "" },		\
-  {"5-compact",	SELECT_SH5_COMPACT, "SH5 SHcompact code" }, \
-  {"5-compact-nofpu", TARGET_NONE, "" },	\
-  {"5-compact-nofpu", SELECT_SH5_COMPACT_NOFPU, "SH5 FPU-less SHcompact code" }
Index: gcc/config/rs6000/aix.opt
===================================================================
--- gcc/config/rs6000/aix.opt	(revision 170272)
+++ gcc/config/rs6000/aix.opt	(working copy)
@@ -1,24 +0,0 @@ 
-; AIX options.
-;
-; Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc.
-; Contributed by Aldy Hernandez <aldy@quesejoda.com>.
-;
-; This file is part of GCC.
-;
-; GCC 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 3, or (at your option) any later
-; version.
-;
-; GCC 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 GCC; see the file COPYING3.  If not see
-; <http://www.gnu.org/licenses/>.
-
-mxl-compat
-Target Var(has_xl_compat_option) Save
-Conform more closely to IBM XLC semantics