--- specs.1	Thu Sep 27 18:43:03 2007
+++ specs.2	Thu Sep 27 18:43:13 2007
@@ -26,3 +26,3 @@
 *cpp_unique_options:
-%{C|CC:%{!E:%eGCC does not support -C or -CC without -E}} %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*} %{P} %I %{MD:-MD %{!o:%b.d}%{o*:%.d%*}} %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}} %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*} %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}} %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i %{E|M|MM:%W{o*}}
+%{C|CC:%{!E:%eGCC does not support -C or -CC without -E}} %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{m32:-I/usr/include32} %{I*} %{P} %I %{MD:-MD %{!o:%b.d}%{o*:%.d%*}} %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}} %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*} %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}} %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i %{E|M|MM:%W{o*}}
 
@@ -44,6 +44,6 @@
 *endfile:
-  %{!shared:crtend.o%s}   %{shared:crtendS.o%s}   crtn.o%s 
+%{m32:  %{!shared:/usr/lib32/crtend.o%s}   %{shared:/usr/lib32/crtendS.o%s}   /usr/lib32/crtn.o%s } %{!m32:  %{!shared:crtend.o%s}   %{shared:crtendS.o%s}   crtn.o%s }
 
 *link:
-  %{m32:-m elf_i386_fbsd}   %{Wl,*:%*}   %{v:-V}   %{assert*} %{R*} %{rpath*} %{defsym*}   %{shared:-Bshareable %{h*} %{soname*}}     %{!shared:       %{!static:         %{rdynamic:-export-dynamic} 	%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }}     %{static:-Bstatic}}   %{symbolic:-Bsymbolic}
+  %{m32:-m elf_i386_fbsd -L/usr/lib32}   %{Wl,*:%*}   %{v:-V}   %{assert*} %{R*} %{rpath*} %{defsym*}   %{shared:-Bshareable %{h*} %{soname*}}     %{!shared:       %{!static:         %{rdynamic:-export-dynamic} 	%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }}     %{static:-Bstatic}}   %{symbolic:-Bsymbolic}
 
@@ -56,3 +56,3 @@
 *startfile:
-  %{!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}
+%{m32:  %{!shared:     %{pg:/usr/lib32/gcrt1.o%s}     %{!pg:       %{p:/usr/lib32/gcrt1.o%s}       %{!p: 	%{profile:/usr/lib32/gcrt1.o%s} 	%{!profile:/usr/lib32/crt1.o%s}}}}   /usr/lib32/crti.o%s   %{!shared:/usr/lib32/crtbegin.o%s}   %{shared:/usr/lib32/crtbeginS.o%s}}  %{!m32: %{!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}}
 
@@ -101,3 +101,3 @@
 *startfile_prefix_spec:
-/usr/lib/
+%{m32:/usr/lib32/} %{!m32:/usr/lib/}