Sun Jul 31 03:43:33 2011 UTC ()
Don't define LINK_EH_SPEC if it's already defined (from netbsd*.h)


(matt)
diff -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/config/freebsd-spec.h

cvs diff -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/config/freebsd-spec.h (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/gcc/config/freebsd-spec.h 2011/06/21 01:21:56 1.1.1.1
+++ src/external/gpl3/gcc/dist/gcc/config/freebsd-spec.h 2011/07/31 03:43:33 1.2
@@ -143,21 +143,21 @@ is built with the --enable-threads confi @@ -143,21 +143,21 @@ is built with the --enable-threads confi
143 } \ 143 } \
144 %{shared: \ 144 %{shared: \
145 %{pthread:-lpthread} -lc \ 145 %{pthread:-lpthread} -lc \
146 }" 146 }"
147#endif 147#endif
148#endif 148#endif
149 149
150#if FBSD_MAJOR < 6 150#if FBSD_MAJOR < 6
151#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1" 151#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
152#else 152#else
153#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1" 153#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
154#endif 154#endif
155 155
156#if defined(HAVE_LD_EH_FRAME_HDR) 156#if defined(HAVE_LD_EH_FRAME_HDR) && !defined(LINK_EH_SPEC)
157#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " 157#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
158#endif 158#endif
159 159
160/* Use --as-needed -lgcc_s for eh support. */ 160/* Use --as-needed -lgcc_s for eh support. */
161#ifdef HAVE_LD_AS_NEEDED 161#ifdef HAVE_LD_AS_NEEDED
162#define USE_LD_AS_NEEDED 1 162#define USE_LD_AS_NEEDED 1
163#endif 163#endif