config.gcc (x86_64-*-rtems*): Use i386/rtemself.h instead of i386/rtems-64.h.

	* config.gcc (x86_64-*-rtems*): Use i386/rtemself.h
	instead of i386/rtems-64.h.
	* config/i386/rtems-64.h: Remove.

From-SVN: r244655

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1ad88a0bc909afcd97e559927a66838a3c5a1618..5cdcfa8398da0f0a83f2f734b7578315703ede40 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-19  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config.gcc (x86_64-*-rtems*): Use i386/rtemself.h
+       instead of i386/rtems-64.h.
+       * config/i386/rtems-64.h: Remove.
+
 2017-01-19  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/78478

diff --git a/gcc/config.gcc b/gcc/config.gcc
index dd8c08cfd9328f6e1e3f148f4318248ceee37087..c0969a1aad009045b09ae36e4c9bb83232e5c8df 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1447,7 +1447,7 @@ x86_64-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
        ;;
 x86_64-*-rtems*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h i386/rtems-64.h"
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h i386/rtemself.h"
        ;;
 i[34567]86-*-rdos*)
     tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/rdos.h"

diff --git a/gcc/config/i386/rtems-64.h b/gcc/config/i386/rtems-64.h
deleted file mode 100644 (file)
index e9faecd..0000000
--- a/gcc/config/i386/rtems-64.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Definitions for rtems targeting an x86_64
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   Contributed by Joel Sherrill (joel@OARcorp.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/>.  */
-
-/* Specify predefined symbols in preprocessor.  */
-
-#define TARGET_OS_CPP_BUILTINS()               \
-  do                                           \
-    {                                          \
-       builtin_define ("__rtems__");           \
-       builtin_define ("__USE_INIT_FINI__");   \
-       builtin_assert ("system=rtems");        \
-    }                                          \
-  while (0)