Remove ueberold a.out configuration leftovers.

3 files changed, 4 insertions, 39 deletions

diff --git a/gnu/gcc/gcc/config/arm/openbsd.h b/gnu/gcc/gcc/config/arm/openbsd.h
index c21d126a791..6ab59855d86 100644
--- a/gnu/gcc/gcc/config/arm/openbsd.h
+++ b/gnu/gcc/gcc/config/arm/openbsd.h
@@ -146,18 +146,6 @@ Boston, MA 02111-1307, USA.  */
 #undef TYPE_OPERAND_FMT
 #define TYPE_OPERAND_FMT "%%%s"
 
-#if 0
-/* HUH ? */
-/* OpenBSD and NetBSD use the old PCC style aggregate returning conventions. */
-#undef DEFAULT_PCC_STRUCT_RETURN
-#define DEFAULT_PCC_STRUCT_RETURN 1
-
-/* Although not normally relevant (since by default, all aggregates
-   are returned in memory) compiling some parts of libc requires
-   non-APCS style struct returns.  */
-#undef RETURN_IN_MEMORY
-#endif
-
 #undef FPUTYPE_DEFAULT
 #define FPUTYPE_DEFAULT FPUTYPE_VFP
 
diff --git a/gnu/gcc/gcc/config/arm/openbsd1.h b/gnu/gcc/gcc/config/arm/openbsd1.h
deleted file mode 100644
index 7d002441a3b..00000000000
--- a/gnu/gcc/gcc/config/arm/openbsd1.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Definitions of target machine for GNU compiler, OpenBSD/arm ELF version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* StrongARM family default cpu. */
-#define SUBTARGET_CPU_DEFAULT 		TARGET_CPU_strongarm
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index c6ed871158d..b4662dc08ac 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.88.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.9 2011/04/06 15:23:39 drahn Exp $
+# $OpenBSD: Makefile,v 1.10 2011/06/25 20:56:21 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -46,10 +46,9 @@ TARGET_INC+=	alpha/openbsd1.h
 TARGET_INC+=	elfos.h
 .endif
 .if ${TARGET_ARCH} == "arm"
-TARGET_INC+=arm/openbsd1.h
-TARGET_INC+=arm/elf.h
-TARGET_INC+=arm/aout.h
-TARGET_INC+=arm/arm.h
+TARGET_INC+=	arm/elf.h
+TARGET_INC+=	arm/aout.h
+TARGET_INC+=	arm/arm.h
 .endif
 .if ${TARGET_ARCH} == "sh"
 TARGET_INC+=	sh/elf.h