Patchwork svr4.h avoidance: m32r

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

Comments

Joseph S. Myers - Dec. 8, 2010, 10:10 p.m.
This patch in the series removing svr4.h from the headers used by
particular targets in GCC stops m32r*-* targets from using svr4.h.

After my three preliminary per-macro cleanup patches, all the macros
left in svr4.h are undefined and then possibly redefined by m32r.h, so
no header changes are needed in this patch.

Tested building cc1 and xgcc for crosses to: m32r-elf m32rle-elf
m32r-rtems m32r-linux-gnu m32rle-linux-gnu.  OK to commit?

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

	* config.gcc (m32r-*-elf*, m32rle-*-elf*, m32r-*-rtems*,
	m32r-*-linux*, m32rle-*-linux*): Don't use svr4.h.
Nick Clifton - Dec. 9, 2010, 3:34 p.m.
Hi Joseph,

> 2010-12-08  Joseph Myers<joseph@codesourcery.com>
>
> 	* config.gcc (m32r-*-elf*, m32rle-*-elf*, m32r-*-rtems*,
> 	m32r-*-linux*, m32rle-*-linux*): Don't use svr4.h.

Approved - please apply.

Cheers
   Nick

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 13:42:33.000000000 -0800
@@ -1615,20 +1615,20 @@  lm32-*-uclinux*)
 	tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
         ;;
 m32r-*-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}"
 	extra_parts="crtinit.o crtfini.o"
  	;;
 m32rle-*-elf*)
-	tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h m32r/little.h ${tm_file}"
+	tm_file="dbxelf.h elfos.h newlib-stdint.h m32r/little.h ${tm_file}"
 	extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
 	;;
 m32r-*-rtems*)
-	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32r/rtems.h rtems.h newlib-stdint.h"
+	tm_file="dbxelf.h elfos.h ${tm_file} m32r/rtems.h rtems.h newlib-stdint.h"
 	tmake_file="m32r/t-m32r t-rtems"
 	extra_parts="crtinit.o crtfini.o"
  	;;
 m32r-*-linux*)
-	tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ${tm_file} m32r/linux.h"
+	tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h ${tm_file} m32r/linux.h"
 	# We override the tmake_file for linux -- why?
 	tmake_file="t-slibgcc-elf-ver m32r/t-linux"
 	gnu_ld=yes
@@ -1637,7 +1637,7 @@  m32r-*-linux*)
 	fi
  	;;
 m32rle-*-linux*)
-	tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h m32r/little.h ${tm_file} m32r/linux.h"
+	tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h m32r/little.h ${tm_file} m32r/linux.h"
 	# We override the tmake_file for linux -- why?
 	tmake_file="t-slibgcc-elf-ver m32r/t-linux"
 	gnu_ld=yes