Module Name:    src
Committed By:   mrg
Date:           Tue Jun 21 07:31:13 UTC 2011

Modified Files:
        src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h

Log Message:
pull across these revisions from gcc 4.1:

revision 1.8
date: 2011/06/11 00:57:29;  author: matt;  state: Exp;  lines: +2 -0
If we are compiling -msoft-float, define _SOFT_FLOAT

revision 1.7
date: 2011/03/12 07:57:38;  author: matt;  state: Exp;  lines: +3 -1
Define HAVE_AS_TLS until our build tools figure out how to do it.

revision 1.6
date: 2011/02/25 22:36:10;  author: matt;  state: Exp;  lines: +7 -0
Explicitly make sure TARGET_SECURE_PLT is defined correctly rather than
relying on HAVE_AS_REL16 from "auto-host.h".

revision 1.5
date: 2011/02/10 07:18:29;  author: matt;  state: Exp;  lines: +3 -0
Default NetBSD to -msecure-plt now.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.2 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.3
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.2	Tue Jun 21 02:41:37 2011
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h	Tue Jun 21 07:31:13 2011
@@ -43,6 +43,10 @@
       builtin_define ("__powerpc__");		\
       builtin_assert ("cpu=powerpc");		\
       builtin_assert ("machine=powerpc");	\
+      if (TARGET_SECURE_PLT)			\
+        builtin_define ("_SECURE_PLT");		\
+      if (TARGET_SOFT_FLOAT)			\
+        builtin_define ("_SOFT_FLOAT");		\
     }						\
   while (0)
 
@@ -109,6 +113,7 @@
 
 #undef  SUBTARGET_EXTRA_SPECS
 #define SUBTARGET_EXTRA_SPECS					\
+  { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },	\
   { "netbsd_link_spec",		NETBSD_LINK_SPEC_ELF },		\
   { "netbsd_entry_point",	NETBSD_ENTRY_POINT },		\
   { "netbsd_endfile_spec",	NETBSD_ENDFILE_SPEC },
@@ -119,6 +124,15 @@
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_STRICT_ALIGN)
 
+/*
+ * We know we have the right binutils for this (we shouldn't need to do this
+ * but until the cross build does the right thing...)
+ */
+#undef TARGET_SECURE_PLT
+#define TARGET_SECURE_PLT secure_plt
+#undef HAVE_AS_TLS
+#define HAVE_AS_TLS 1
+
 /* Attempt to enable execute permissions on the stack.  */
 #define TRANSFER_FROM_TRAMPOLINE NETBSD_ENABLE_EXECUTE_STACK
 #ifdef L_trampoline

Reply via email to