config.gcc (x86_64-*-kfreebsd*-gnu): Use i386/kfreebsd-gnu.h.

2011-04-11  Joseph Myers  <joseph@codesourcery.com>
            Robert Millan  <rmh@gnu.org>

	* config.gcc (x86_64-*-kfreebsd*-gnu): Use i386/kfreebsd-gnu.h.
	* config/i386/kfreebsd-gnu.h (GNU_USER_DYNAMIC_LINKER32,
	GNU_USER_DYNAMIC_LINKER64): Define.
	(REG_NAME): Don't undefine.
	(MD_UNWIND_SUPPORT): Undefine.
	* config/i386/knetbsd-gnu.h (GNU_USER_LINK_EMULATION): Define.
	(REG_NAME): Don't undefine.
	(MD_UNWIND_SUPPORT): Undefine.
	* config/i386/kopensolaris-gnu.h (GNU_USER_LINK_EMULATION):
	Define.

Co-Authored-By: Robert Millan <rmh@gnu.org>
From-SVN: r172279

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff1cb3671eaa0ea26f651ca5ab7df7a659eb7b25..f8634740bf3c5a27580ff3e0284af3566b081f9c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2011-04-11  Joseph Myers  <joseph@codesourcery.com>
+            Robert Millan  <rmh@gnu.org>
+
+       * config.gcc (x86_64-*-kfreebsd*-gnu): Use i386/kfreebsd-gnu.h.
+       * config/i386/kfreebsd-gnu.h (GNU_USER_DYNAMIC_LINKER32,
+       GNU_USER_DYNAMIC_LINKER64): Define.
+       (REG_NAME): Don't undefine.
+       (MD_UNWIND_SUPPORT): Undefine.
+       * config/i386/knetbsd-gnu.h (GNU_USER_LINK_EMULATION): Define.
+       (REG_NAME): Don't undefine.
+       (MD_UNWIND_SUPPORT): Undefine.
+       * config/i386/kopensolaris-gnu.h (GNU_USER_LINK_EMULATION):
+       Define.
+
 2011-04-11  Joseph Myers  <joseph@codesourcery.com>
 
        * config/i386/gnu.h (GNU_USER_LINK_EMULATION): Define.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index a95d46ee22da12c7760bb669d88906e2fbbb318f..41c46e68bab35772abbe7a573d0e28736c8ccee1 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1243,7 +1243,7 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
        case ${target} in
        x86_64-*-linux*)
          default_gnu_indirect_function=glibc-2011 ;;
-       x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
+       x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
        x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;;
        esac
        tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"

diff --git a/gcc/config/i386/kfreebsd-gnu.h b/gcc/config/i386/kfreebsd-gnu.h
index 8c4be69a98cea25696856352735490b8e8390776..ab9e4401daec764dd0cc30e003873512a7ef576d 100644 (file)
--- a/gcc/config/i386/kfreebsd-gnu.h
+++ b/gcc/config/i386/kfreebsd-gnu.h
@@ -21,5 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 
 #undef GNU_USER_LINK_EMULATION
 #define GNU_USER_LINK_EMULATION "elf_i386_fbsd"
-#undef REG_NAME
-#define REG_NAME(reg) sc_ ## reg
+
+#undef GNU_USER_DYNAMIC_LINKER32
+#define GNU_USER_DYNAMIC_LINKER32 "/lib/ld.so.1"
+
+#undef GNU_USER_DYNAMIC_LINKER64
+#define GNU_USER_DYNAMIC_LINKER64 "/lib/ld-kfreebsd-x86-64.so.1"
+
+#undef MD_UNWIND_SUPPORT

diff --git a/gcc/config/i386/knetbsd-gnu.h b/gcc/config/i386/knetbsd-gnu.h
index 54f5a6920f84427205fcf14fbf1b76f038b726f4..1384a25cea43a83bc4ce206ccbe11283aa61df5d 100644 (file)
--- a/gcc/config/i386/knetbsd-gnu.h
+++ b/gcc/config/i386/knetbsd-gnu.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running kNetBSD-based GNU systems with ELF format
-   Copyright (C) 2004, 2007
+   Copyright (C) 2004, 2007, 2011
    Free Software Foundation, Inc.
    Contributed by Robert Millan.
 
@@ -19,5 +19,6 @@ 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/>.  */
 
-#undef REG_NAME
-#define REG_NAME(reg) sc_ ## reg
+#define GNU_USER_LINK_EMULATION "elf_i386"
+
+#undef MD_UNWIND_SUPPORT

diff --git a/gcc/config/i386/kopensolaris-gnu.h b/gcc/config/i386/kopensolaris-gnu.h
index 3e315b83f36da4cf1e7c75e9ff490236881d6d3e..ede302949842433d96d36bd9eab42468eb976277 100644 (file)
--- a/gcc/config/i386/kopensolaris-gnu.h
+++ b/gcc/config/i386/kopensolaris-gnu.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running kOpenSolaris-based GNU systems with ELF format
-   Copyright (C) 2009
+   Copyright (C) 2009, 2011
    Free Software Foundation, Inc.
    Contributed by Robert Millan.
 
@@ -19,4 +19,6 @@ 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/>.  */
 
+#define GNU_USER_LINK_EMULATION "elf_i386"
+
 #undef MD_UNWIND_SUPPORT