From b1372d5de2cf9b5c2d4cb97eeb2256ee60b49ef9 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 11 Apr 2011 22:22:36 +0100 Subject: [PATCH] config.gcc (x86_64-*-kfreebsd*-gnu): Use i386/kfreebsd-gnu.h. 2011-04-11 Joseph Myers Robert Millan * 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 From-SVN: r172279 --- gcc/ChangeLog | 14 ++++++++++++++ gcc/config.gcc | 2 +- gcc/config/i386/kfreebsd-gnu.h | 10 ++++++++-- gcc/config/i386/knetbsd-gnu.h | 7 ++++--- gcc/config/i386/kopensolaris-gnu.h | 4 +++- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ff1cb3671ea..f8634740bf3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2011-04-11 Joseph Myers + Robert Millan + + * 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 * config/i386/gnu.h (GNU_USER_LINK_EMULATION): Define. diff --git a/gcc/config.gcc b/gcc/config.gcc index a95d46ee22d..41c46e68bab 100644 --- 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 8c4be69a98c..ab9e4401dae 100644 --- 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 54f5a6920f8..1384a25cea4 100644 --- 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 . */ -#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 3e315b83f36..ede30294984 100644 --- 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 . */ +#define GNU_USER_LINK_EMULATION "elf_i386" + #undef MD_UNWIND_SUPPORT -- 2.30.2