Patchwork [RFC] powerpc64 FreeBSD support

login
register
mail settings
Submitter Andreas Tobler
Date Dec. 22, 2011, 8:44 p.m.
Message ID <4EF396BF.5040402@fgznet.ch>
Download mbox | patch
Permalink /patch/132907/
State New
Headers show

Comments

Andreas Tobler - Dec. 22, 2011, 8:44 p.m.
Hi all,

the attached patch adds support for powerpc64-*-freebsd*.
Results are/were sent to the test results list.

A few words about the patch.
I have chosen the way to add separate freebsd* files because FreeBSD 
supports not as much as linux does in regard of the PowerPC CPU's. For 
example we only have FreeBSD running on 970 CPU's. POWER support on the 
kernel side is wip, but it grows very slow.

Also, powerpc FreeBSD has 64-bit long doubles while linux-ppc has 128-bit.

The architecture itself is a 64-bit one which can execute 32-bit 
binaries. But it its primary bit width is 64-bit. It is not wanted that 
we have a 32-bit compiler which can build 64-bit objects.

To have a clearer picture and not to influence linux-ppc I thought 
having its own set of files would be easier.

I'd appreciate feedback on the patch.

There are some issues with the tests, I'm cleaning and trying to make 
them work. In certain areas I need to fix the kernel or the libc first 
and this takes some time.

One thing is the libstdc++ test I had to skip. Here the test tries to 
allocate int_max mem. And this blows my machine :)

Here the CL's.

Thank you!
Andreas

gcc:
----

2011-12-22  Andreas Tobler  <andreast@fgznet.ch>

	* configure.ac (HAVE_LD_NO_DOT_SYMBOLS): Add powerpc64-*-freebsd*.
	Introduce emul_name to select the right linker emulation for
	powerpc64-*-freebsd*.
	* configure: Regenerate.
	* config.gcc: Add bits to support powerpc64-*-freebsd*.
	* config/rs6000/freebsd.h (POWERPC_FREEBSD): Define.
	* config/rs6000/freebsd64.h: New file.
	* config/rs6000/rs6000.c (rs6000_option_override_internal): Use
	POWERPC_FREEBSD.
	(rs6000_savres_strategy): Likewise.
	(rs6000_savres_routine_name): Likewise.
	(rs6000_elf_file_end): Likewise.
	* config/rs6000/t-freebsd64: New file.
	* config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Set the
	rs6000_current_abi for 64-bit FreeBSD to ABI_AIX.

libgcc:
-------

2011-12-22  Andreas Tobler  <andreast@fgznet.ch>

	* config.host: Add bits to support powerpc64-*-freebsd*.
	* config/rs6000/freebsd-unwind.h: New file.
	* config/rs6000/t-freebsd64: New file.

libstdc++:
----------
2011-12-22  Andreas Tobler  <andreast@fgznet.ch>

	* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Skip
	this test on powerpc64-*-freebsd*.
Andreas Tobler - March 2, 2012, 4:04 p.m.
Ping!

Any comments on the patch?

Thanks,
Andreas

On 22.12.11 21:44, Andreas Tobler wrote:
> Hi all,
>
> the attached patch adds support for powerpc64-*-freebsd*.
> Results are/were sent to the test results list.
>
> A few words about the patch.
> I have chosen the way to add separate freebsd* files because FreeBSD
> supports not as much as linux does in regard of the PowerPC CPU's. For
> example we only have FreeBSD running on 970 CPU's. POWER support on the
> kernel side is wip, but it grows very slow.
>
> Also, powerpc FreeBSD has 64-bit long doubles while linux-ppc has 128-bit.
>
> The architecture itself is a 64-bit one which can execute 32-bit
> binaries. But it its primary bit width is 64-bit. It is not wanted that
> we have a 32-bit compiler which can build 64-bit objects.
>
> To have a clearer picture and not to influence linux-ppc I thought
> having its own set of files would be easier.
>
> I'd appreciate feedback on the patch.
>
> There are some issues with the tests, I'm cleaning and trying to make
> them work. In certain areas I need to fix the kernel or the libc first
> and this takes some time.
>
> One thing is the libstdc++ test I had to skip. Here the test tries to
> allocate int_max mem. And this blows my machine :)
>
> Here the CL's.
>
> Thank you!
> Andreas
>
> gcc:
> ----
>
> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>
> 	* configure.ac (HAVE_LD_NO_DOT_SYMBOLS): Add powerpc64-*-freebsd*.
> 	Introduce emul_name to select the right linker emulation for
> 	powerpc64-*-freebsd*.
> 	* configure: Regenerate.
> 	* config.gcc: Add bits to support powerpc64-*-freebsd*.
> 	* config/rs6000/freebsd.h (POWERPC_FREEBSD): Define.
> 	* config/rs6000/freebsd64.h: New file.
> 	* config/rs6000/rs6000.c (rs6000_option_override_internal): Use
> 	POWERPC_FREEBSD.
> 	(rs6000_savres_strategy): Likewise.
> 	(rs6000_savres_routine_name): Likewise.
> 	(rs6000_elf_file_end): Likewise.
> 	* config/rs6000/t-freebsd64: New file.
> 	* config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Set the
> 	rs6000_current_abi for 64-bit FreeBSD to ABI_AIX.
>
> libgcc:
> -------
>
> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>
> 	* config.host: Add bits to support powerpc64-*-freebsd*.
> 	* config/rs6000/freebsd-unwind.h: New file.
> 	* config/rs6000/t-freebsd64: New file.
>
> libstdc++:
> ----------
> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>
> 	* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Skip
> 	this test on powerpc64-*-freebsd*.
David Edelsohn - March 2, 2012, 4:28 p.m.
On Fri, Mar 2, 2012 at 11:04 AM, Andreas Tobler <andreast-list@fgznet.ch> wrote:

>> the attached patch adds support for powerpc64-*-freebsd*.
>> Results are/were sent to the test results list.
>>
>> A few words about the patch.
>> I have chosen the way to add separate freebsd* files because FreeBSD
>> supports not as much as linux does in regard of the PowerPC CPU's. For
>> example we only have FreeBSD running on 970 CPU's. POWER support on the
>> kernel side is wip, but it grows very slow.
>>
>> Also, powerpc FreeBSD has 64-bit long doubles while linux-ppc has 128-bit.
>>
>> The architecture itself is a 64-bit one which can execute 32-bit
>> binaries. But it its primary bit width is 64-bit. It is not wanted that
>> we have a 32-bit compiler which can build 64-bit objects.
>>
>> To have a clearer picture and not to influence linux-ppc I thought
>> having its own set of files would be easier.
>>
>> I'd appreciate feedback on the patch.
>>
>> There are some issues with the tests, I'm cleaning and trying to make
>> them work. In certain areas I need to fix the kernel or the libc first
>> and this takes some time.
>>
>> One thing is the libstdc++ test I had to skip. Here the test tries to
>> allocate int_max mem. And this blows my machine :)
>>
>> Here the CL's.
>>
>> Thank you!
>> Andreas
>>
>> gcc:
>> ----
>>
>> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>>
>>        * configure.ac (HAVE_LD_NO_DOT_SYMBOLS): Add powerpc64-*-freebsd*.
>>        Introduce emul_name to select the right linker emulation for
>>        powerpc64-*-freebsd*.
>>        * configure: Regenerate.
>>        * config.gcc: Add bits to support powerpc64-*-freebsd*.
>>        * config/rs6000/freebsd.h (POWERPC_FREEBSD): Define.
>>        * config/rs6000/freebsd64.h: New file.
>>        * config/rs6000/rs6000.c (rs6000_option_override_internal): Use
>>        POWERPC_FREEBSD.
>>        (rs6000_savres_strategy): Likewise.
>>        (rs6000_savres_routine_name): Likewise.
>>        (rs6000_elf_file_end): Likewise.
>>        * config/rs6000/t-freebsd64: New file.
>>        * config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Set the
>>        rs6000_current_abi for 64-bit FreeBSD to ABI_AIX.
>>
>> libgcc:
>> -------
>>
>> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>>
>>        * config.host: Add bits to support powerpc64-*-freebsd*.
>>        * config/rs6000/freebsd-unwind.h: New file.
>>        * config/rs6000/t-freebsd64: New file.
>>
>> libstdc++:
>> ----------
>> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>>
>>        * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc:
>> Skip
>>        this test on powerpc64-*-freebsd*.

This patch is okay for trunk now that it has opened for 4.8 release.
I thought that Loren might comment.

Thanks, David
Andreas Tobler - March 21, 2012, 8:16 p.m.
On 02.03.12 17:28, David Edelsohn wrote:
> On Fri, Mar 2, 2012 at 11:04 AM, Andreas Tobler<andreast-list@fgznet.ch>  wrote:
>
>>> the attached patch adds support for powerpc64-*-freebsd*.
>>> Results are/were sent to the test results list.
>>>
>>> A few words about the patch.
>>> I have chosen the way to add separate freebsd* files because FreeBSD
>>> supports not as much as linux does in regard of the PowerPC CPU's. For
>>> example we only have FreeBSD running on 970 CPU's. POWER support on the
>>> kernel side is wip, but it grows very slow.
>>>
>>> Also, powerpc FreeBSD has 64-bit long doubles while linux-ppc has 128-bit.
>>>
>>> The architecture itself is a 64-bit one which can execute 32-bit
>>> binaries. But it its primary bit width is 64-bit. It is not wanted that
>>> we have a 32-bit compiler which can build 64-bit objects.
>>>
>>> To have a clearer picture and not to influence linux-ppc I thought
>>> having its own set of files would be easier.
>>>
>>> I'd appreciate feedback on the patch.
>>>
>>> There are some issues with the tests, I'm cleaning and trying to make
>>> them work. In certain areas I need to fix the kernel or the libc first
>>> and this takes some time.
>>>
>>> One thing is the libstdc++ test I had to skip. Here the test tries to
>>> allocate int_max mem. And this blows my machine :)
>>>
>>> Here the CL's.
>>>
>>> Thank you!
>>> Andreas
>>>
>>> gcc:
>>> ----
>>>
>>> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>>>
>>>         * configure.ac (HAVE_LD_NO_DOT_SYMBOLS): Add powerpc64-*-freebsd*.
>>>         Introduce emul_name to select the right linker emulation for
>>>         powerpc64-*-freebsd*.
>>>         * configure: Regenerate.
>>>         * config.gcc: Add bits to support powerpc64-*-freebsd*.
>>>         * config/rs6000/freebsd.h (POWERPC_FREEBSD): Define.
>>>         * config/rs6000/freebsd64.h: New file.
>>>         * config/rs6000/rs6000.c (rs6000_option_override_internal): Use
>>>         POWERPC_FREEBSD.
>>>         (rs6000_savres_strategy): Likewise.
>>>         (rs6000_savres_routine_name): Likewise.
>>>         (rs6000_elf_file_end): Likewise.
>>>         * config/rs6000/t-freebsd64: New file.
>>>         * config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Set the
>>>         rs6000_current_abi for 64-bit FreeBSD to ABI_AIX.
>>>
>>> libgcc:
>>> -------
>>>
>>> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>>>
>>>         * config.host: Add bits to support powerpc64-*-freebsd*.
>>>         * config/rs6000/freebsd-unwind.h: New file.
>>>         * config/rs6000/t-freebsd64: New file.
>>>
>>> libstdc++:
>>> ----------
>>> 2011-12-22  Andreas Tobler<andreast@fgznet.ch>
>>>
>>>         * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc:
>>> Skip
>>>         this test on powerpc64-*-freebsd*.
>
> This patch is okay for trunk now that it has opened for 4.8 release.
> I thought that Loren might comment.

Thank you David!

I commited this patch to trunk, r185613-r185615.

Results are here:

http://gcc.gnu.org/ml/gcc-testresults/2012-03/msg02067.html

I'll continue to improve the port...

Again, thanks.
Andreas

Patch

Index: gcc/configure.ac
===================================================================
--- gcc/configure.ac	(revision 182631)
+++ gcc/configure.ac	(working copy)
@@ -4371,7 +4371,15 @@ 
 fi
 
 case "$target:$tm_file" in
-  powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*)
+  powerpc64-*-freebsd* | powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*)
+  case "$target" in
+     *-*-linux*)
+     emul_name="-melf64ppc"
+      ;;
+     *-*-freebsd*)
+     emul_name="-melf64ppc_fbsd"
+      ;;
+  esac
     AC_CACHE_CHECK(linker support for omitting dot symbols,
     gcc_cv_ld_no_dot_syms,
     [gcc_cv_ld_no_dot_syms=no
@@ -4398,7 +4406,7 @@ 
 EOF
       if $gcc_cv_as -a64 -o conftest1.o conftest1.s > /dev/null 2>&1 \
          && $gcc_cv_as -a64 -o conftest2.o conftest2.s > /dev/null 2>&1 \
-         && $gcc_cv_ld -melf64ppc -o conftest conftest1.o conftest2.o > /dev/null 2>&1; then
+         && $gcc_cv_ld $emul_name -o conftest conftest1.o conftest2.o > /dev/null 2>&1; then
         gcc_cv_ld_no_dot_syms=yes
       fi
       rm -f conftest conftest1.o conftest2.o conftest1.s conftest2.s
@@ -4428,7 +4436,7 @@ 
 	ld 9,ie0@got@tprel@l(9)
 EOF
       if $gcc_cv_as -a64 -o conftest.o conftest.s > /dev/null 2>&1 \
-         && $gcc_cv_ld -melf64ppc --no-toc-sort -o conftest conftest.o > /dev/null 2>&1; then
+         && $gcc_cv_ld $emul_name --no-toc-sort -o conftest conftest.o > /dev/null 2>&1; then
         gcc_cv_ld_large_toc=yes
       fi
       rm -f conftest conftest.o conftest.s
Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc	(revision 182631)
+++ gcc/config.gcc	(working copy)
@@ -1926,10 +1926,20 @@ 
 	tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
 	extra_headers=altivec.h
 	;;
-powerpc-*-freebsd*)
-	tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
+powerpc*-*-freebsd*)
+	tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h"
+	extra_options="${extra_options} rs6000/sysv4.opt"
 	tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-	extra_options="${extra_options} rs6000/sysv4.opt"
+	case ${host} in
+	     powerpc64*)
+	    	tm_file="${tm_file} rs6000/default64.h rs6000/freebsd64.h"
+		tmake_file="${tmake_file} rs6000/t-freebsd64"
+		extra_options="${extra_options} rs6000/linux64.opt"
+		;;
+	     *)
+	        tm_file="${tm_file} rs6000/freebsd.h"
+		;;
+	esac
 	;;
 powerpc-*-netbsd*)
 	tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
Index: gcc/config/rs6000/t-freebsd64
===================================================================
--- gcc/config/rs6000/t-freebsd64	(revision 0)
+++ gcc/config/rs6000/t-freebsd64	(revision 0)
@@ -0,0 +1,32 @@ 
+#rs6000/t-freebsd64
+
+# Copyright (C) 2011, 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.
+#
+# 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/>.
+
+# On FreeBSD the 32-bit libraries are found under /usr/lib32.
+# Set MULTILIB_OSDIRNAMES according to this.
+
+MULTILIB_OPTIONS        = m32 msoft-float
+MULTILIB_DIRNAMES       = 32 nof
+MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
+MULTILIB_EXCEPTIONS     =
+MULTILIB_EXCLUSIONS     = !m32/msoft-float 
+MULTILIB_OSDIRNAMES	= ../lib32
+#MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
+
+
Index: gcc/config/rs6000/rs6000.c
===================================================================
--- gcc/config/rs6000/rs6000.c	(revision 182631)
+++ gcc/config/rs6000/rs6000.c	(working copy)
@@ -2834,7 +2834,7 @@ 
 	rs6000_long_double_type_size = RS6000_DEFAULT_LONG_DOUBLE_SIZE;
     }
 
-#ifndef POWERPC_LINUX
+#if !defined (POWERPC_LINUX) && !defined (POWERPC_FREEBSD)
   if (!global_options_set.x_rs6000_ieeequad)
     rs6000_ieeequad = 1;
 #endif
@@ -17498,7 +17498,7 @@ 
       && info->cr_save_p)
     strategy |= REST_INLINE_GPRS;
 
-#ifdef POWERPC_LINUX
+#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD)
   if (TARGET_64BIT)
     {
       if (!(strategy & SAVE_INLINE_FPRS))
@@ -19038,7 +19038,7 @@ 
     }
   else if (DEFAULT_ABI == ABI_AIX)
     {
-#ifndef POWERPC_LINUX
+#if !defined (POWERPC_LINUX) && !defined (POWERPC_FREEBSD)
       /* No out-of-line save/restore routines for GPRs on AIX.  */
       gcc_assert (!TARGET_AIX || !gpr);
 #endif
@@ -19048,7 +19048,7 @@ 
 	prefix = (savep
 		  ? (lr ? "_savegpr0_" : "_savegpr1_")
 		  : (lr ? "_restgpr0_" : "_restgpr1_"));
-#ifdef POWERPC_LINUX
+#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD)
       else if (lr)
 	prefix = (savep ? "_savefpr_" : "_restfpr_");
 #endif
@@ -25042,7 +25042,7 @@ 
 		 aix_struct_return ? 2 : 1);
     }
 #endif
-#ifdef POWERPC_LINUX
+#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD)
   if (TARGET_32BIT)
     file_end_indicate_exec_stack ();
 #endif
Index: gcc/config/rs6000/freebsd64.h
===================================================================
--- gcc/config/rs6000/freebsd64.h	(revision 0)
+++ gcc/config/rs6000/freebsd64.h	(revision 0)
@@ -0,0 +1,439 @@ 
+
+/* Definitions for 64-bit PowerPC running FreeBSD using the ELF format.
+   Derived from linux64.h.
+   Copyright (C) 2011 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.
+
+   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/>.  */
+
+/* Override the defaults, which exist to force the proper definition.  */
+
+#ifdef IN_LIBGCC2
+#undef TARGET_64BIT
+#ifdef __powerpc64__
+#define TARGET_64BIT 1
+#else
+#define TARGET_64BIT 0
+#endif
+#endif
+
+#undef	TARGET_AIX
+#define	TARGET_AIX TARGET_64BIT
+
+#ifdef HAVE_LD_NO_DOT_SYMS
+extern int dot_symbols;
+#undef DOT_SYMBOLS
+#define DOT_SYMBOLS dot_symbols
+#endif
+
+#define TARGET_USES_LINUX64_OPT 1
+#ifdef HAVE_LD_LARGE_TOC
+#undef TARGET_CMODEL
+#define TARGET_CMODEL rs6000_current_cmodel
+#define SET_CMODEL(opt) rs6000_current_cmodel = opt
+#else
+#define SET_CMODEL(opt) do {} while (0)
+#endif
+
+/* Until now the 970 is the only Processor where FreeBSD 64-bit runs on.  */
+#undef  PROCESSOR_DEFAULT
+#define PROCESSOR_DEFAULT PROCESSOR_POWER4
+#undef  PROCESSOR_DEFAULT64
+#define PROCESSOR_DEFAULT64 PROCESSOR_POWER4
+
+/* We don't need to generate entries in .fixup, except when
+   -mrelocatable or -mrelocatable-lib is given.  */
+#undef RELOCATABLE_NEEDS_FIXUP
+#define RELOCATABLE_NEEDS_FIXUP \
+  (target_flags & target_flags_explicit & MASK_RELOCATABLE)
+
+#undef  RS6000_ABI_NAME
+#define RS6000_ABI_NAME "freebsd"
+
+#define INVALID_64BIT "-m%s not supported in this configuration"
+#define INVALID_32BIT INVALID_64BIT
+
+#undef  SUBSUBTARGET_OVERRIDE_OPTIONS
+#define SUBSUBTARGET_OVERRIDE_OPTIONS				\
+  do								\
+    {								\
+      if (!global_options_set.x_rs6000_alignment_flags)		\
+	rs6000_alignment_flags = MASK_ALIGN_NATURAL;		\
+      if (TARGET_64BIT)						\
+	{							\
+	  if (DEFAULT_ABI != ABI_AIX)				\
+	    {							\
+	      rs6000_current_abi = ABI_AIX;			\
+	      error (INVALID_64BIT, "call");			\
+	    }							\
+	  dot_symbols = !strcmp (rs6000_abi_name, "aixdesc");	\
+	  if (target_flags & MASK_RELOCATABLE)			\
+	    {							\
+	      target_flags &= ~MASK_RELOCATABLE;		\
+	      error (INVALID_64BIT, "relocatable");		\
+	    }							\
+	  if (target_flags & MASK_EABI)				\
+	    {							\
+	      target_flags &= ~MASK_EABI;			\
+	      error (INVALID_64BIT, "eabi");			\
+	    }							\
+	  if (TARGET_PROTOTYPE)					\
+	    {							\
+	      target_prototype = 0;				\
+	      error (INVALID_64BIT, "prototype");		\
+	    }							\
+	  if ((target_flags & MASK_POWERPC64) == 0)		\
+	    {							\
+	      target_flags |= MASK_POWERPC64;			\
+	      error ("-m64 requires a PowerPC64 cpu");		\
+	    }							\
+	   if ((target_flags_explicit & MASK_MINIMAL_TOC) != 0)	\
+	    {							\
+	      if (global_options_set.x_rs6000_current_cmodel	\
+		  && rs6000_current_cmodel != CMODEL_SMALL)	\
+		error ("-mcmodel incompatible with other toc options"); \
+	      SET_CMODEL (CMODEL_SMALL);			\
+	    }							\
+	  else							\
+	    {							\
+	      if (!global_options_set.x_rs6000_current_cmodel)	\
+		SET_CMODEL (CMODEL_MEDIUM);			\
+	      if (rs6000_current_cmodel != CMODEL_SMALL)	\
+		{						\
+		  TARGET_NO_FP_IN_TOC = 0;			\
+		  TARGET_NO_SUM_IN_TOC = 0;			\
+		}						\
+	    }							\
+	}							\
+    }								\
+  while (0)
+
+#undef	ASM_DEFAULT_SPEC
+#undef	ASM_SPEC
+#undef	LINK_OS_FREEBSD_SPEC
+
+#define	ASM_DEFAULT_SPEC "-mppc%{!m32:64}"
+#define	ASM_SPEC	 "%{m32:%(asm_spec32)}%{!m32:%(asm_spec64)} %(asm_spec_common)"
+#define	LINK_OS_FREEBSD_SPEC "%{m32:%(link_os_freebsd_spec32)}%{!m32:%(link_os_freebsd_spec64)}"
+
+#define ASM_SPEC32 "-a32 \
+%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
+%{memb} %{!memb: %{msdata=eabi: -memb}} \
+%{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
+    %{mcall-freebsd: -mbig} \
+    %{mcall-i960-old: -mlittle} \
+    %{mcall-linux: -mbig} \
+    %{mcall-gnu: -mbig} \
+    %{mcall-netbsd: -mbig} \
+}}}}"
+
+#define ASM_SPEC64 "-a64"
+
+#define ASM_SPEC_COMMON "%(asm_cpu) \
+%{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}} \
+%{mlittle} %{mlittle-endian} %{mbig} %{mbig-endian}"
+
+#undef	SUBSUBTARGET_EXTRA_SPECS
+#define SUBSUBTARGET_EXTRA_SPECS					\
+  { "asm_spec_common",		ASM_SPEC_COMMON },			\
+  { "asm_spec32",		ASM_SPEC32 },				\
+  { "asm_spec64",		ASM_SPEC64 },				\
+  { "link_os_freebsd_spec32",	LINK_OS_FREEBSD_SPEC32 },     		\
+  { "link_os_freebsd_spec64",	LINK_OS_FREEBSD_SPEC64 },
+
+#define FREEBSD_DYNAMIC_LINKER32 "/libexec/ld-elf32.so.1"
+#define FREEBSD_DYNAMIC_LINKER64 "/libexec/ld-elf.so.1"
+
+#define LINK_OS_FREEBSD_SPEC_DEF32 "\
+  %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \
+  %{v:-V} \
+  %{assert*} %{R*} %{rpath*} %{defsym*} \
+  %{shared:-Bshareable %{h*} %{soname*}} \
+  %{!shared: \
+    %{!static: \
+      %{rdynamic: -export-dynamic} \
+      %{!dynamic-linker:-dynamic-linker " FREEBSD_DYNAMIC_LINKER32 "}} \
+    %{static:-Bstatic}} \
+  %{symbolic:-Bsymbolic}"
+
+#define LINK_OS_FREEBSD_SPEC_DEF64 "\
+  %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \
+  %{v:-V} \
+  %{assert*} %{R*} %{rpath*} %{defsym*} \
+  %{shared:-Bshareable %{h*} %{soname*}} \
+  %{!shared: \
+    %{!static: \
+      %{rdynamic: -export-dynamic} \
+      %{!dynamic-linker:-dynamic-linker " FREEBSD_DYNAMIC_LINKER64 "}} \
+    %{static:-Bstatic}} \
+  %{symbolic:-Bsymbolic}"
+
+#define LINK_OS_FREEBSD_SPEC32 "-melf32ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF32
+  
+#define LINK_OS_FREEBSD_SPEC64 "-melf64ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF64
+
+#undef	MULTILIB_DEFAULTS
+#define MULTILIB_DEFAULTS { "m64" }
+
+/* PowerPC-64 FreeBSD increases natural record alignment to doubleword if
+   the first field is an FP double, only if in power alignment mode.  */
+#undef  ROUND_TYPE_ALIGN
+#define ROUND_TYPE_ALIGN(STRUCT, COMPUTED, SPECIFIED)			\
+  ((TARGET_64BIT							\
+    && (TREE_CODE (STRUCT) == RECORD_TYPE				\
+	|| TREE_CODE (STRUCT) == UNION_TYPE				\
+	|| TREE_CODE (STRUCT) == QUAL_UNION_TYPE)			\
+    && TARGET_ALIGN_NATURAL == 0)					\
+   ? rs6000_special_round_type_align (STRUCT, COMPUTED, SPECIFIED)	\
+   : MAX ((COMPUTED), (SPECIFIED)))
+
+/* Use the default for compiling target libs.  */
+#ifdef IN_TARGET_LIBS
+#undef TARGET_ALIGN_NATURAL
+#define TARGET_ALIGN_NATURAL 1
+#endif
+
+/* Indicate that jump tables go in the text section.  */
+#undef  JUMP_TABLES_IN_TEXT_SECTION
+#define JUMP_TABLES_IN_TEXT_SECTION TARGET_64BIT
+
+/* The linux ppc64 ABI isn't explicit on whether aggregates smaller
+   than a doubleword should be padded upward or downward.  You could
+   reasonably assume that they follow the normal rules for structure
+   layout treating the parameter area as any other block of memory,
+   then map the reg param area to registers.  i.e. pad upward.
+   Setting both of the following defines results in this behavior.
+   Setting just the first one will result in aggregates that fit in a
+   doubleword being padded downward, and others being padded upward.
+   Not a bad idea as this results in struct { int x; } being passed
+   the same way as an int.  */
+#define AGGREGATE_PADDING_FIXED TARGET_64BIT
+#define AGGREGATES_PAD_UPWARD_ALWAYS 0
+
+/* Specify padding for the last element of a block move between
+   registers and memory.  FIRST is nonzero if this is the only
+   element.  */
+#define BLOCK_REG_PADDING(MODE, TYPE, FIRST) \
+  (!(FIRST) ? upward : FUNCTION_ARG_PADDING (MODE, TYPE))
+
+/* FreeBSD doesn't support saving and restoring 64-bit regs with a 32-bit
+   kernel. This is supported when running on a 64-bit kernel with
+   COMPAT_FREEBSD32, but tell GCC it isn't so that our 32-bit binaries
+   are compatible. */
+#define OS_MISSING_POWERPC64 !TARGET_64BIT
+
+#undef  FBSD_TARGET_CPU_CPP_BUILTINS
+#define FBSD_TARGET_CPU_CPP_BUILTINS()			\
+  do							\
+    {							\
+      builtin_define ("__PPC__");			\
+      builtin_define ("__ppc__");			\
+      builtin_define ("__powerpc__");			\
+      if (TARGET_64BIT)					\
+	{						\
+	  builtin_define ("__arch64__");		\
+	  builtin_define ("__LP64__");			\
+	  builtin_define ("__PPC64__");			\
+	  builtin_define ("__powerpc64__");		\
+	  builtin_assert ("cpu=powerpc64");		\
+	  builtin_assert ("machine=powerpc64");		\
+	}						\
+      else						\
+	{						\
+	  builtin_define_std ("PPC");			\
+	  builtin_define_std ("powerpc");		\
+	  builtin_assert ("cpu=powerpc");		\
+	  builtin_assert ("machine=powerpc");		\
+	  TARGET_OS_SYSV_CPP_BUILTINS ();		\
+	}						\
+    }							\
+  while (0)
+
+#undef	CPP_OS_DEFAULT_SPEC
+#define CPP_OS_DEFAULT_SPEC "%(cpp_os_freebsd)"
+
+#undef CPP_OS_FREEBSD_SPEC
+#define CPP_OS_FREEBSD_SPEC ""
+
+#undef	STARTFILE_DEFAULT_SPEC
+#define STARTFILE_DEFAULT_SPEC "%(startfile_freebsd)"
+
+#undef	ENDFILE_DEFAULT_SPEC
+#define ENDFILE_DEFAULT_SPEC "%(endfile_freebsd)"
+
+#undef	LIB_DEFAULT_SPEC
+#define LIB_DEFAULT_SPEC "%(lib_freebsd)"
+
+#undef	LINK_START_DEFAULT_SPEC
+#define LINK_START_DEFAULT_SPEC "%(link_start_freebsd)"
+
+#undef	LINK_OS_DEFAULT_SPEC
+#define	LINK_OS_DEFAULT_SPEC "%(link_os_freebsd)"
+
+/* XXX: This is wrong for many platforms in sysv4.h.
+   We should work on getting that definition fixed.  */
+#undef  LINK_SHLIB_SPEC
+#define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
+
+
+/************************[  Target stuff  ]***********************************/
+
+/* Define the actual types of some ANSI-mandated types.  
+   Needs to agree with <machine/ansi.h>.  GCC defaults come from c-decl.c,
+   c-common.c, and config/<arch>/<arch>.h.  */
+
+
+#undef  SIZE_TYPE
+#define SIZE_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int")
+
+#undef  PTRDIFF_TYPE
+#define PTRDIFF_TYPE	(TARGET_64BIT ? "long int" : "int")
+
+/* rs6000.h gets this wrong for FreeBSD.  We use the GCC defaults instead.  */
+#undef WCHAR_TYPE
+#define	WCHAR_TYPE      (TARGET_64BIT ? "int" : "long int")
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
+
+/* Override rs6000.h definition.  */
+#undef  ASM_APP_ON
+#define ASM_APP_ON "#APP\n"
+
+/* Override rs6000.h definition.  */
+#undef  ASM_APP_OFF
+#define ASM_APP_OFF "#NO_APP\n"
+
+/* PowerPC no-op instruction.  */
+#undef  RS6000_CALL_GLUE
+#define RS6000_CALL_GLUE (TARGET_64BIT ? "nop" : "cror 31,31,31")
+
+/* Function profiling bits */
+#undef  RS6000_MCOUNT
+#define RS6000_MCOUNT "_mcount"
+
+#define PROFILE_HOOK(LABEL) \
+  do { if (TARGET_64BIT) output_profile_hook (LABEL); } while (0)
+
+/* _init and _fini functions are built from bits spread across many
+   object files, each potentially with a different TOC pointer.  For
+   that reason, place a nop after the call so that the linker can
+   restore the TOC pointer if a TOC adjusting call stub is needed.  */
+#ifdef __powerpc64__
+#define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC)	\
+  asm (SECTION_OP "\n"					\
+"	bl " #FUNC "\n"					\
+"	nop\n"						\
+"	.previous");
+#endif
+
+/* FP save and restore routines.  */
+#undef  SAVE_FP_PREFIX
+#define SAVE_FP_PREFIX (TARGET_64BIT ? "._savef" : "_savefpr_")
+#undef  SAVE_FP_SUFFIX
+#define SAVE_FP_SUFFIX ""
+#undef  RESTORE_FP_PREFIX
+#define RESTORE_FP_PREFIX (TARGET_64BIT ? "._restf" : "_restfpr_")
+#undef  RESTORE_FP_SUFFIX
+#define RESTORE_FP_SUFFIX ""
+
+/* Select a format to encode pointers in exception handling data.  CODE
+   is 0 for data, 1 for code labels, 2 for function pointers.  GLOBAL is
+   true if the symbol may be affected by dynamic relocations.  */
+#undef	ASM_PREFERRED_EH_DATA_FORMAT
+#define	ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL) \
+  ((TARGET_64BIT || flag_pic || TARGET_RELOCATABLE)			\
+   ? (((GLOBAL) ? DW_EH_PE_indirect : 0) | DW_EH_PE_pcrel		\
+      | (TARGET_64BIT ? DW_EH_PE_udata8 : DW_EH_PE_sdata4))		\
+   : DW_EH_PE_absptr)
+
+/* Static stack checking is supported by means of probes.  */
+#define STACK_CHECK_STATIC_BUILTIN 1
+
+/* The default value isn't sufficient in 64-bit mode.  */
+#define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
+
+#define DBX_REGISTER_NUMBER(REGNO) rs6000_dbx_register_number (REGNO)
+
+/* PowerPC64 Linux word-aligns FP doubles when -malign-power is given.  */
+#undef  ADJUST_FIELD_ALIGN
+#define ADJUST_FIELD_ALIGN(FIELD, COMPUTED) \
+  ((TARGET_ALTIVEC && TREE_CODE (TREE_TYPE (FIELD)) == VECTOR_TYPE)     \
+   ? 128                                                                \
+   : (TARGET_64BIT                                                      \
+      && TARGET_ALIGN_NATURAL == 0                                      \
+      && TYPE_MODE (strip_array_types (TREE_TYPE (FIELD))) == DFmode)   \
+   ? MIN ((COMPUTED), 32)                                               \
+   : (COMPUTED))
+
+#undef  TOC_SECTION_ASM_OP
+#define TOC_SECTION_ASM_OP \
+  (TARGET_64BIT                                         \
+   ? "\t.section\t\".toc\",\"aw\""                      \
+   : "\t.section\t\".got\",\"aw\"")
+
+#undef  MINIMAL_TOC_SECTION_ASM_OP
+#define MINIMAL_TOC_SECTION_ASM_OP \
+  (TARGET_64BIT                                         \
+   ? "\t.section\t\".toc1\",\"aw\""                     \
+   : ((TARGET_RELOCATABLE || flag_pic)                  \
+      ? "\t.section\t\".got2\",\"aw\""                  \
+      : "\t.section\t\".got1\",\"aw\""))
+
+/* This is how to declare the size of a function.  */
+#undef  ASM_DECLARE_FUNCTION_SIZE
+#define ASM_DECLARE_FUNCTION_SIZE(FILE, FNAME, DECL)                    \
+  do                                                                    \
+    {                                                                   \
+      if (!flag_inhibit_size_directive)                                 \
+        {                                                               \
+          fputs ("\t.size\t", (FILE));                                  \
+          if (TARGET_64BIT && DOT_SYMBOLS)                              \
+            putc ('.', (FILE));                                         \
+          assemble_name ((FILE), (FNAME));                              \
+          fputs (",.-", (FILE));                                        \
+          rs6000_output_function_entry (FILE, FNAME);                   \
+          putc ('\n', (FILE));                                          \
+        }                                                               \
+    }                                                                   \
+  while (0)
+
+#undef  ASM_OUTPUT_SPECIAL_POOL_ENTRY_P
+#define ASM_OUTPUT_SPECIAL_POOL_ENTRY_P(X, MODE)                        \
+  (TARGET_TOC                                                           \
+   && (GET_CODE (X) == SYMBOL_REF                                       \
+       || (GET_CODE (X) == CONST && GET_CODE (XEXP (X, 0)) == PLUS      \
+           && GET_CODE (XEXP (XEXP (X, 0), 0)) == SYMBOL_REF)           \
+       || GET_CODE (X) == LABEL_REF                                     \
+       || (GET_CODE (X) == CONST_INT                                    \
+           && GET_MODE_BITSIZE (MODE) <= GET_MODE_BITSIZE (Pmode))      \
+       || (GET_CODE (X) == CONST_DOUBLE                                 \
+           && ((TARGET_64BIT                                            \
+                && (TARGET_MINIMAL_TOC                                  \
+                    || (SCALAR_FLOAT_MODE_P (GET_MODE (X))              \
+                        && ! TARGET_NO_FP_IN_TOC)))                     \
+               || (!TARGET_64BIT                                        \
+                   && !TARGET_NO_FP_IN_TOC                              \
+                   && !TARGET_RELOCATABLE                               \
+                   && SCALAR_FLOAT_MODE_P (GET_MODE (X))                \
+                   && BITS_PER_WORD == HOST_BITS_PER_INT)))))
+
+/* Use --as-needed -lgcc_s for eh support.  */
+#ifdef HAVE_LD_AS_NEEDED
+#define USE_LD_AS_NEEDED 1
+#endif
+
+#define POWERPC_FREEBSD
Index: gcc/config/rs6000/freebsd.h
===================================================================
--- gcc/config/rs6000/freebsd.h	(revision 182631)
+++ gcc/config/rs6000/freebsd.h	(working copy)
@@ -75,3 +75,6 @@ 
   (target_flags & target_flags_explicit & MASK_RELOCATABLE)
 
 #define DBX_REGISTER_NUMBER(REGNO) rs6000_dbx_register_number (REGNO)
+
+#define POWERPC_FREEBSD
+
Index: gcc/config/rs6000/sysv4.h
===================================================================
--- gcc/config/rs6000/sysv4.h	(revision 182631)
+++ gcc/config/rs6000/sysv4.h	(working copy)
@@ -89,9 +89,8 @@ 
     }									\
   else if (!strcmp (rs6000_abi_name, "aixdesc"))			\
     rs6000_current_abi = ABI_AIX;					\
-  else if (!strcmp (rs6000_abi_name, "freebsd"))			\
-    rs6000_current_abi = ABI_V4;					\
-  else if (!strcmp (rs6000_abi_name, "linux"))				\
+  else if (!strcmp (rs6000_abi_name, "freebsd")				\
+	   || !strcmp (rs6000_abi_name, "linux"))			\
     {									\
       if (TARGET_64BIT)							\
 	rs6000_current_abi = ABI_AIX;					\
Index: libgcc/config.host
===================================================================
--- libgcc/config.host	(revision 182631)
+++ libgcc/config.host	(working copy)
@@ -842,9 +842,15 @@ 
 	tmake_file="$tmake_file rs6000/t-darwin64 rs6000/t-ibm-ldouble"
 	extra_parts="$extra_parts crt2.o"
 	;;
-powerpc-*-freebsd*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-savresfgpr rs6000/t-crtstuff rs6000/t-freebsd t-softfp-sfdf t-softfp-excl t-softfp t-slibgcc-libgcc"
+powerpc*-*-freebsd*)
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-savresfgpr rs6000/t-crtstuff rs6000/t-freebsd t-softfp-sfdf t-softfp-excl t-softfp"
 	extra_parts="$extra_parts crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
+	case ${host} in
+	powerpc64*)
+	  tmake_file="${tmake_file} rs6000/t-freebsd64"
+	  md_unwind_header=rs6000/freebsd-unwind.h
+	  ;;
+	esac
 	;;
 powerpc-*-netbsd*)
 	tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
Index: libgcc/config/rs6000/t-freebsd64
===================================================================
--- libgcc/config/rs6000/t-freebsd64	(revision 0)
+++ libgcc/config/rs6000/t-freebsd64	(revision 0)
@@ -0,0 +1,5 @@ 
+HOST_LIBGCC2_CFLAGS += -mno-minimal-toc
+SHLIB_MAPFILES = libgcc-std.ver
+
+softfp_wrap_start := '\#ifndef __powerpc64__'
+softfp_wrap_end := '\#endif'
Index: libgcc/config/rs6000/freebsd-unwind.h
===================================================================
--- libgcc/config/rs6000/freebsd-unwind.h	(revision 0)
+++ libgcc/config/rs6000/freebsd-unwind.h	(revision 0)
@@ -0,0 +1,70 @@ 
+/* DWARF2 EH unwinding support for PowerPC64 FreeBSD, derived from
+   linux-unwind.h
+   Copyright (C) 2011 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 R_LR		65
+
+#define MD_FROB_UPDATE_CONTEXT frob_update_context
+
+static void
+frob_update_context (struct _Unwind_Context *context,
+		     _Unwind_FrameState *fs ATTRIBUTE_UNUSED)
+{
+  const unsigned int *pc = (const unsigned int *) context->ra;
+
+#ifdef __powerpc64__
+  if (fs->regs.reg[2].how == REG_UNSAVED)
+    {
+      /* If the current unwind info (FS) does not contain explicit info
+	 saving R2, then we have to do a minor amount of code reading to
+	 figure out if it was saved.  The big problem here is that the
+	 code that does the save/restore is generated by the linker, so
+	 we have no good way to determine at compile time what to do.  */
+      if (pc[0] == 0xF8410028
+	  || ((pc[0] & 0xFFFF0000) == 0x3D820000
+	      && pc[1] == 0xF8410028))
+	{
+	  /* We are in a plt call stub or r2 adjusting long branch stub,
+	     before r2 has been saved.  Keep REG_UNSAVED.  */
+	}
+      else
+	{
+	  unsigned int *insn
+	    = (unsigned int *) _Unwind_GetGR (context, R_LR);
+	  if (insn && *insn == 0xE8410028)
+	    _Unwind_SetGRPtr (context, 2, context->cfa + 40);
+	  else if (pc[0] == 0x4E800421
+		   && pc[1] == 0xE8410028)
+	    {
+	      /* We are at the bctrl instruction in a call via function
+		 pointer.  gcc always emits the load of the new R2 just
+		 before the bctrl so this is the first and only place
+		 we need to use the stored R2.  */
+	      _Unwind_Word sp = _Unwind_GetGR (context, 1);
+	      _Unwind_SetGRPtr (context, 2, (void *)(sp + 40));
+	    }
+	}
+    }
+#endif
+}
Index: libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc
===================================================================
--- libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc	(revision 182631)
+++ libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc	(working copy)
@@ -1,4 +1,4 @@ 
-// Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -17,6 +17,7 @@ 
 
 // 23.2.5 class vector<bool> [lib.vector.bool]
 
+// { dg-skip-if "" { powerpc64-*-freebsd* } { "*" } { "" } }
 // { dg-do run { xfail *-*-darwin8.[0-4].* } }
 
 #include <vector>