Patchwork svr4.h avoidance: ia64

login
register
mail settings
Submitter Joseph S. Myers
Date Dec. 8, 2010, 2:57 p.m.
Message ID <Pine.LNX.4.64.1012081456020.1827@digraph.polyomino.org.uk>
Download mbox | patch
Permalink /patch/74727/
State New
Headers show

Comments

Joseph S. Myers - Dec. 8, 2010, 2:57 p.m.
This patch in the series removing svr4.h from the headers used by
particular targets in GCC stops ia64*-*-linux* and ia64*-*-hpux* from
using svr4.h.

After my three preliminary per-macro cleanup patches, neither of these
targets actually used any macros from svr4.h so no header changes are
needed in this patch.  Note that there is a header ia64/sysv4.h
"Override definitions in elfos.h/svr4.h to be correct for IA64" which
is actually used for all ia64*-* targets, and it could probably be
simplified by moving those definitions that related to svr4.h into
ia64.h, but I'm not doing that right now.

Tested building cc1 and xgcc for crosses to ia64-linux-gnu and
ia64-hp-hpux11.23.  OK to commit?

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

	* config.gcc (ia64*-*-linux*, ia64*-*-hpux*): Don't use svr4.h.
Steve Ellcey - Dec. 8, 2010, 5:51 p.m.
On Wed, 2010-12-08 at 14:57 +0000, Joseph S. Myers wrote:
> This patch in the series removing svr4.h from the headers used by
> particular targets in GCC stops ia64*-*-linux* and ia64*-*-hpux* from
> using svr4.h.
> 
> After my three preliminary per-macro cleanup patches, neither of these
> targets actually used any macros from svr4.h so no header changes are
> needed in this patch.  Note that there is a header ia64/sysv4.h
> "Override definitions in elfos.h/svr4.h to be correct for IA64" which
> is actually used for all ia64*-* targets, and it could probably be
> simplified by moving those definitions that related to svr4.h into
> ia64.h, but I'm not doing that right now.
> 
> Tested building cc1 and xgcc for crosses to ia64-linux-gnu and
> ia64-hp-hpux11.23.  OK to commit?
> 
> 2010-12-08  Joseph Myers  <joseph@codesourcery.com>
> 
> 	* config.gcc (ia64*-*-linux*, ia64*-*-hpux*): Don't use svr4.h.

This looks OK to me.

Steve Ellcey
sje@cup.hp.com

Patch

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-08 06:46:58.000000000 -0800
@@ -1557,7 +1557,7 @@  ia64*-*-freebsd*)
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
 	;;
 ia64*-*-linux*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ia64/sysv4.h ia64/linux.h"
+	tm_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h ia64/sysv4.h ia64/linux.h"
 	tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
 	if test x$with_system_libunwind != xyes ; then
 		tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
@@ -1566,7 +1566,7 @@  ia64*-*-linux*)
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
 	;;
 ia64*-*-hpux*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h"
+	tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/hpux.h"
 	tmake_file="ia64/t-ia64 ia64/t-hpux"
 	target_cpu_default="MASK_GNU_AS"
 	case x$enable_threads in