 @@ -27561,32 +27561,32 @@ rm -f core conftest.err conftest.$ac_obj
 done
 LDFLAGS="$saved_LDFLAGS"
 if test "x$gcc_cv_ld_clearcap" = xyes; then
 $as_echo "#define HAVE_LD_CLEARCAP 1" >>confdefs.h
   ac_config_links="$ac_config_links clearcap.map:${srcdir}/config/$clearcap_map"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_clearcap" >&5
 $as_echo "$gcc_cv_ld_clearcap" >&6; }
 case "$target:$tm_file" in
-  powerpc64-*-freebsd* | powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*)
+  powerpc64-*-freebsd* | powerpc64-*-netbsd* | powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*)
   case "$target" in
      *le-*-linux*)
      emul_name="-melf64lppc"
       ;;
-     *-*-linux*)
+     *-*-linux* | *-*-netbsd*)
      emul_name="-melf64ppc"
       ;;
      *-*-freebsd*)
      emul_name="-melf64ppc_fbsd"
       ;;
   esac
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker support for omitting dot symbols" >&5
 $as_echo_n "checking linker support for omitting dot symbols... " >&6; }
 if test "${gcc_cv_ld_no_dot_syms+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gcc_cv_ld_no_dot_syms=no
     if test x"$ld_is_gold" = xyes; then

 @@ -5071,32 +5071,32 @@ for clearcap_map in sol2-clearcapv2.map
   LDFLAGS="$saved_LDFLAGS -Wl,-M,${srcdir}/config/$clearcap_map"
   AC_LINK_IFELSE([int main(void) {return 0;}],
     [gcc_cv_ld_clearcap=yes; break], [gcc_cv_ld_clearcap=no])
 done
 LDFLAGS="$saved_LDFLAGS"
 if test "x$gcc_cv_ld_clearcap" = xyes; then
   AC_DEFINE([HAVE_LD_CLEARCAP], 1,
 [Define if the linker supports clearing hardware capabilities via mapfile.])
   AC_CONFIG_LINKS([clearcap.map:${srcdir}/config/$clearcap_map])
 fi
 AC_MSG_RESULT($gcc_cv_ld_clearcap)
 case "$target:$tm_file" in
-  powerpc64-*-freebsd* | powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*)
+  powerpc64-*-freebsd* | powerpc64-*-netbsd* | powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*)
   case "$target" in
      *le-*-linux*)
      emul_name="-melf64lppc"
       ;;
-     *-*-linux*)
+     *-*-linux* | *-*-netbsd*)
      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
     if test x"$ld_is_gold" = xyes; then
       gcc_cv_ld_no_dot_syms=yes
     elif test $in_tree_ld = yes ; then
       if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2; then

 @@ -298,33 +298,26 @@ extern int dot_symbols;
 #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))
 /* NetBSD doesn't support saving and restoring 64-bit regs in a 32-bit
    process.  XXXMRG?  */
 #define OS_MISSING_POWERPC64 !TARGET_64BIT
 /* NetBSD has float and long double forms of math functions.  */
 #undef  TARGET_C99_FUNCTIONS
 #define TARGET_C99_FUNCTIONS 1
 /* NetBSD doesn't have sincos that follows the GNU extension.  */
 #undef  TARGET_HAS_SINCOS
 #undef  TARGET_OS_CPP_BUILTINS
 #define TARGET_OS_CPP_BUILTINS()			\
   do							\
     {							\
       NETBSD_OS_CPP_BUILTINS_ELF();			\
       if (TARGET_ISEL)					\
 	builtin_define ("__PPC_ISEL__");		\
       if (TARGET_64BIT)					\
 	{						\
 	  builtin_define ("__PPC__");			\
 	  builtin_define ("__PPC64__");			\
 	  builtin_define ("__powerpc__");		\
 	  builtin_define ("__powerpc64__");		\