This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
fix darwin-i386 problem with last patch
- From: Geoffrey Keating <gkeating at apple dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: shebs at apple dot com
- Date: Wed, 18 Dec 2002 21:18:34 -0800 (PST)
- Subject: fix darwin-i386 problem with last patch
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=
============================================================