Patchwork svr4.h avoidance: vax

login
register
mail settings
Submitter Joseph S. Myers
Date Dec. 9, 2010, 11:04 p.m.
Message ID <Pine.LNX.4.64.1012092303410.32497@digraph.polyomino.org.uk>
Download mbox | patch
Permalink /patch/75008/
State New
Headers show

Comments

Joseph S. Myers - Dec. 9, 2010, 11:04 p.m.
This patch in the series removing svr4.h from the headers used by
particular targets in GCC stops vax-*-linux* from using that header,
adding the macros used from it to vax/linux.h.

Tested building cc1 and xgcc for cross to vax-linux-gnu.  OK to
commit?

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

	* config/vax/linux.h (WCHAR_TYPE, WCHAR_TYPE_SIZE): Define.
	* config.gcc (vax-*-linux*): Don't use svr4.h.
Jan-Benedict Glaw - Dec. 10, 2010, 12:33 a.m.
On Thu, 2010-12-09 23:04:23 +0000, Joseph S. Myers <joseph@codesourcery.com> wrote:
> This patch in the series removing svr4.h from the headers used by
> particular targets in GCC stops vax-*-linux* from using that header,
> adding the macros used from it to vax/linux.h.
> 
> Tested building cc1 and xgcc for cross to vax-linux-gnu.  OK to
> commit?

Looks good to me, but Matt has to ACK that.

MfG, JBG
Matt Thomas - Dec. 10, 2010, 12:37 a.m.
On Dec 9, 2010, at 4:33 PM, Jan-Benedict Glaw wrote:

> On Thu, 2010-12-09 23:04:23 +0000, Joseph S. Myers <joseph@codesourcery.com> wrote:
>> This patch in the series removing svr4.h from the headers used by
>> particular targets in GCC stops vax-*-linux* from using that header,
>> adding the macros used from it to vax/linux.h.
>> 
>> Tested building cc1 and xgcc for cross to vax-linux-gnu.  OK to
>> commit?
> 
> Looks good to me, but Matt has to ACK that.

Don't about the linux configury so I was waiting for you.
Since you bless it, I'll bless it too.

Patch

Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc	(revision 167658)
+++ gcc/config.gcc	(working copy)
@@ -2633,7 +2633,7 @@  v850-*-*)
 	use_gcc_stdint=wrap
 	;;
 vax-*-linux*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h vax/elf.h vax/linux.h"
+	tm_file="${tm_file} dbxelf.h elfos.h linux.h vax/elf.h vax/linux.h"
 	tmake_file="${tmake_file} vax/t-linux"
 	;;
 vax-*-netbsdelf*)
Index: gcc/config/vax/linux.h
===================================================================
--- gcc/config/vax/linux.h	(revision 167658)
+++ gcc/config/vax/linux.h	(working copy)
@@ -46,3 +46,9 @@  along with GCC; see the file COPYING3.  
       %{rdynamic:-export-dynamic} \
       -dynamic-linker /lib/ld.so.1} \
     %{static:-static}}"
+
+#undef  WCHAR_TYPE
+#define WCHAR_TYPE "long int"
+
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE BITS_PER_WORD