From e5cd9dacdfae42cad746d33895c6ef8b62db17a5 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Thu, 24 Apr 2003 10:37:23 +0000
Subject: Fifty-one months after ELF flag day, and after the system compiler
 became ELF-only as well, remove support for aout from the next generation of
 GCC.

Suggested by:	Loren James Rittle <rittle@labs.mot.com>
Discussed with:	obrien
---
 lang/gcc40/Makefile       |  4 ----
 lang/gcc40/files/patch-ad | 42 ---------------------------------------
 lang/gcc40/files/patch-af | 50 -----------------------------------------------
 3 files changed, 96 deletions(-)
 delete mode 100644 lang/gcc40/files/patch-ad
 delete mode 100644 lang/gcc40/files/patch-af

(limited to 'lang/gcc40')

diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index ab6e961bb930..c1bfd63a760d 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -40,11 +40,7 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
-.else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
-.endif
 
 GCC_REV=	${PORTVERSION:C/\.0$//}
 #SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
diff --git a/lang/gcc40/files/patch-ad b/lang/gcc40/files/patch-ad
deleted file mode 100644
index a5a58354932e..000000000000
--- a/lang/gcc40/files/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
---- gcc/config/i386/freebsd-aout.h.orig	Fri Nov 15 06:57:11 2002
-+++ gcc/config/i386/freebsd-aout.h	Sat Apr 19 21:16:26 2003
-@@ -94,6 +94,9 @@
- 
- /* Profiling routines, partially copied from i386/osfrose.h.  */
- 
-+/* Tell final.c that we don't need a label passed to mcount.  */
-+#define NO_PROFILE_COUNTERS 1
-+
- #undef MCOUNT_NAME
- #define MCOUNT_NAME "mcount"
- #undef PROFILE_COUNT_REGISTER
-@@ -112,6 +115,7 @@
- 
- #define TYPE_ASM_OP	"\t.type\t"
- #define SIZE_ASM_OP	"\t.size\t"
-+#define SET_ASM_OP	"\t.set\t"
- 
- /* The following macro defines the format used to output the second
-    operand of the .type assembler directive.  Different svr4 assemblers
-@@ -121,6 +125,12 @@
- 
- #define TYPE_OPERAND_FMT	"@%s"
- 
-+#define HANDLE_SYSV_PRAGMA	1
-+
-+#define ASM_WEAKEN_LABEL(FILE,NAME) \
-+	do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \
-+	fputc ('\n', FILE); } while (0)
-+
- /* Write the extra assembler code needed to declare a function's result.
-    Most svr4 assemblers don't require any special declaration of the
-    result value, but there are exceptions.  */
-@@ -209,6 +219,8 @@
- #define STARTFILE_SPEC  \
-   "%{shared:c++rt0.o%s} \
-    %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}"
-+
-+#define MD_STARTFILE_PREFIX "/usr/lib/aout/"
- 
- /* Define this so we can compile MS code for use with WINE.  */
- #define HANDLE_PRAGMA_PACK_PUSH_POP
diff --git a/lang/gcc40/files/patch-af b/lang/gcc40/files/patch-af
deleted file mode 100644
index 9da4d3279d7c..000000000000
--- a/lang/gcc40/files/patch-af
+++ /dev/null
@@ -1,50 +0,0 @@
---- gcc/config/i386/freebsd.h.orig	Wed May 30 16:05:31 2001
-+++ gcc/config/i386/freebsd.h	Mon Jun 18 17:47:30 2001
-@@ -76,6 +76,14 @@
-   
- #undef WCHAR_TYPE_SIZE
- #define WCHAR_TYPE_SIZE BITS_PER_WORD
-+
-+#undef  CC1_SPEC
-+#define CC1_SPEC "\
-+  %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
-+  %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}"
-+
-+#undef  ASM_SPEC
-+#define ASM_SPEC	"%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}"
-     
- /* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add
-    the magical crtbegin.o file (see crtstuff.c) which provides part 
-@@ -84,11 +92,18 @@
-    
- #undef	STARTFILE_SPEC
- #define STARTFILE_SPEC \
--  "%{!shared: \
--     %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
--		       %{!p:%{profile:gcrt1.o%s} \
--			 %{!profile:crt1.o%s}}}} \
--   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
-+  "%{maout: %{shared:c++rt0.o%s} \
-+    %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}} \
-+  %{!maout: \
-+    %{!shared: \
-+      %{pg:gcrt1.o%s} \
-+      %{!pg:%{p:gcrt1.o%s} \
-+	    %{!p:%{profile:gcrt1.o%s} \
-+		 %{!profile:crt1.o%s}}}} \
-+    crti.o%s \
-+    %{!shared:crtbegin.o%s} \
-+    %{shared:crtbeginS.o%s} \
-+   }"
- 
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD.  Here we tack on
-    the magical crtend.o file (see crtstuff.c) which provides part of 
-@@ -98,7 +113,7 @@
- 
- #undef	ENDFILE_SPEC
- #define ENDFILE_SPEC \
--  "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
-+  "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}"
- 
- /* Provide a LINK_SPEC appropriate for FreeBSD.  Here we provide support
-    for the special GCC options -static and -shared, which allow us to
-- 
cgit v1.2.3