gcc/

	* config.gcc (arm-wrs-vxworks): Don't include svr4.h.
	* config/vxworks.h (PTRDIFF_TYPE, SIZE_TYPE, TARGET_POSIX_IO): Define.
	* config/arm/vxworks.h (ASM_SPEC): Delete.
	(SUBTARGET_EXTRA_ASM_SPEC): Define.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126310 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 578f014..8ecbb2c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-04  Richard Sandiford  <richard@codesourcery.com>
+
+       * config.gcc (arm-wrs-vxworks): Don't include svr4.h.
+       * config/vxworks.h (PTRDIFF_TYPE, SIZE_TYPE, TARGET_POSIX_IO): Define.
+       * config/arm/vxworks.h (ASM_SPEC): Delete.
+       (SUBTARGET_EXTRA_ASM_SPEC): Define.
+
 2007-07-04  Sebastian Pop  <sebpop@gmail.com>
 
        * tree-data-ref.h (data_dependence_relation): New flag reversed_p.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 66c3dd9..38ba1df 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -700,7 +700,7 @@ arm-semi-aof | armel-semi-aof)
        tmake_file="arm/t-arm arm/t-semi"
        ;;
 arm-wrs-vxworks)
-       tm_file="elfos.h svr4.h arm/elf.h arm/aout.h ${tm_file} vx-common.h vxworks.h arm/vxworks.h"
+       tm_file="elfos.h arm/elf.h arm/aout.h ${tm_file} vx-common.h vxworks.h arm/vxworks.h"
        tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
        ;;
 arm*-*-freebsd*|strongarm*-*-freebsd*)

diff --git a/gcc/config/arm/vxworks.h b/gcc/config/arm/vxworks.h
index e3f2be0..58fea14 100644 (file)
--- a/gcc/config/arm/vxworks.h
+++ b/gcc/config/arm/vxworks.h
@@ -76,10 +76,8 @@ Boston, MA 02110-1301, USA.  */
 #define VXWORKS_ENDIAN_SPEC \
   "%{mbig-endian|t4be|t4tbe|t5be|t5tbe|txscalebe:-EB}"
 
-/* The -Q options from svr4.h aren't understood and must be removed.  */
-#undef  ASM_SPEC
-#define ASM_SPEC \
-  "%{v:-V} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} " VXWORKS_ENDIAN_SPEC
+#undef SUBTARGET_EXTRA_ASM_SPEC
+#define SUBTARGET_EXTRA_ASM_SPEC VXWORKS_ENDIAN_SPEC
 
 #undef LINK_SPEC
 #define LINK_SPEC VXWORKS_LINK_SPEC " " VXWORKS_ENDIAN_SPEC

diff --git a/gcc/config/vxworks.h b/gcc/config/vxworks.h
index c975371..2535b7a 100644 (file)
--- a/gcc/config/vxworks.h
+++ b/gcc/config/vxworks.h
@@ -106,6 +106,16 @@ extern void vxworks_asm_out_destructor (rtx symbol, int priority);
 #undef VXWORKS_GOTT_INDEX
 #define VXWORKS_GOTT_INDEX "__GOTT_INDEX__"
 
+/* As for svr4.h (which not all VxWorks targets include). */
+#undef PTRDIFF_TYPE
+#define PTRDIFF_TYPE "int"
+
+#undef SIZE_TYPE
+#define SIZE_TYPE "unsigned int"
+
+/* Both kernels and RTPs have the facilities required by this macro.  */
+#define TARGET_POSIX_IO
+
 /* A VxWorks implementation of TARGET_OS_CPP_BUILTINS.  */
 #define VXWORKS_OS_CPP_BUILTINS()                                      \
   do                                                                   \