public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* fix darwin-i386 problem with last patch
@ 2002-12-18 21:18 Geoffrey Keating
  0 siblings, 0 replies; only message in thread
From: Geoffrey Keating @ 2002-12-18 21:18 UTC (permalink / raw)
  To: gcc-patches; +Cc: shebs


A problem I introduced in my last patch when removing conflict
markers...

-- 
- Geoffrey Keating <geoffk@apple.com>

===File ~/patches/gcc-darwinconfigfix.patch=================
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 1.16140
diff -u -p -u -p -r1.16140 ChangeLog
--- ChangeLog	18 Dec 2002 22:45:24 -0000	1.16140
+++ ChangeLog	19 Dec 2002 05:17:13 -0000
@@ -1,3 +1,8 @@
+2002-12-18  Geoffrey Keating  <geoffk@apple.com>
+
+	* config.gcc: Set extra_objs in the generic Darwin rule,
+	not in the machine-specific rules.
+
 2002-11-18  Geoffrey Keating  <geoffk@apple.com>
 
 	* config/rs6000/t-rs6000: Move contents to t-fprules,
Index: config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.268
diff -u -p -u -p -r1.268 config.gcc
--- config.gcc	18 Dec 2002 22:45:34 -0000	1.268
+++ config.gcc	19 Dec 2002 05:17:13 -0000
@@ -470,6 +470,7 @@ case $machine in
 	extra_parts="crt2.o"
 	# Darwin linker does collect2 functionality
 	use_collect2=no
+	extra_objs="darwin.o"
 	;;	
 *-*-vxworks*)
 	tmake_file=t-vxworks
@@ -1958,7 +1959,6 @@ powerpc-*-beos*)
 powerpc-*-darwin*)
 	tm_file="${tm_file} rs6000/darwin.h"
 	tmake_file="rs6000/t-fprules t-darwin rs6000/t-darwin"
-	extra_objs="darwin.o"
 	extra_headers=altivec.h
 	# override ppc default
 	need_64bit_hwint=
============================================================

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2002-12-19  5:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-12-18 21:18 fix darwin-i386 problem with last patch Geoffrey Keating

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).