Patchwork svr4.h avoidance: frv

login
register
mail settings
Submitter Joseph S. Myers
Date Dec. 7, 2010, 5:07 p.m.
Message ID <Pine.LNX.4.64.1012071704470.16137@digraph.polyomino.org.uk>
Download mbox | patch
Permalink /patch/74583/
State New
Headers show

Comments

Joseph S. Myers - Dec. 7, 2010, 5:07 p.m.
This patch in the series removing svr4.h from the headers used by
particular targets in GCC stops frv-*-elf and frv-*-*linux* (which
covers all frv-* targets) from using svr4.h, defining the macros used
from that header in frv.h instead.

Tested building cc1 and xgcc for crosses to frv-elf and frv-linux-gnu.
OK to commit?

2010-12-07  Joseph Myers  <joseph@codesourcery.com>

	* config/frv/frv.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
	WCHAR_TYPE_SIZE): Define.
	* config.gcc (frv-*-elf, frv-*-*linux*): Don't use svr4.h.
Alexandre Oliva - Dec. 8, 2010, 3:50 a.m.
On Dec  7, 2010, "Joseph S. Myers" <joseph@codesourcery.com> wrote:

> Tested building cc1 and xgcc for crosses to frv-elf and frv-linux-gnu.
> OK to commit?

Sure, thanks

> 2010-12-07  Joseph Myers  <joseph@codesourcery.com>

> 	* config/frv/frv.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
> 	WCHAR_TYPE_SIZE): Define.
> 	* config.gcc (frv-*-elf, frv-*-*linux*): Don't use svr4.h.
Nick Clifton - Dec. 9, 2010, 3:31 p.m.
Hi Joseph,

> 2010-12-07  Joseph Myers<joseph@codesourcery.com>
>
> 	* config/frv/frv.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
> 	WCHAR_TYPE_SIZE): Define.
> 	* config.gcc (frv-*-elf, frv-*-*linux*): Don't use svr4.h.

Approved - please apply.

Cheers
   Nick

Patch

diff -rupN --exclude=.svn gcc-mainline-3/gcc/config/frv/frv.h gcc-mainline/gcc/config/frv/frv.h
--- gcc-mainline-3/gcc/config/frv/frv.h	2010-12-02 09:40:30.000000000 -0800
+++ gcc-mainline/gcc/config/frv/frv.h	2010-12-07 08:53:29.000000000 -0800
@@ -514,6 +514,18 @@ 
    default with the options `-fsigned-char' and `-funsigned-char'.  */
 #define DEFAULT_SIGNED_CHAR 1
 
+#undef  SIZE_TYPE
+#define SIZE_TYPE "unsigned int"
+
+#undef  PTRDIFF_TYPE
+#define PTRDIFF_TYPE "int"
+
+#undef  WCHAR_TYPE
+#define WCHAR_TYPE "long int"
+
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE BITS_PER_WORD
+
 
 /* General purpose registers.  */
 #define GPR_FIRST       0                       /* First gpr */
diff -rupN --exclude=.svn gcc-mainline-3/gcc/config.gcc gcc-mainline/gcc/config.gcc
--- gcc-mainline-3/gcc/config.gcc	2010-12-06 03:31:49.000000000 -0800
+++ gcc-mainline/gcc/config.gcc	2010-12-07 08:53:52.000000000 -0800
@@ -966,12 +966,12 @@  fr30-*-elf)
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	;;
 frv-*-elf)
-	tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+	tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
 	tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
 	tmake_file=frv/t-frv
 	;;
 frv-*-*linux*)
-	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} \
+	tm_file="dbxelf.h elfos.h ${tm_file} \
 	         linux.h glibc-stdint.h frv/linux.h"
 	tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
 	tmake_file="${tmake_file} frv/t-frv frv/t-linux"