--- gcc/config/freebsd-spec.h.orig	Tue Nov 20 18:06:45 2001
+++ gcc/config/freebsd-spec.h	Sat Feb  2 13:37:38 2002
@@ -79,7 +82,10 @@
 #define FBSD_CPP_SPEC "							\
   %(cpp_cpu)								\
   %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__}		\
-  %{posix:-D_POSIX_SOURCE}"
+  %{posix:-D_POSIX_SOURCE}						\
+  %{!maout: -D__ELF__}							\
+  %{munderscores: -D__UNDERSCORES__}					\
+  %{maout: %{!mno-underscores: -D__UNDERSCORES__}}"
 
 /* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add
    the magical crtbegin.o file (see crtstuff.c) which provides part