--- specs.ashes	2004-03-29 02:14:53.000000000 -0500
+++ specs	2004-03-29 02:17:26.000000000 -0500
@@ -15,7 +15,7 @@
  as %(asm_options) %{!pipe:%g.s} %A }
 
 *cpp:
-%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} %{!D__KERNEL__:%{!static:%{!no-pie:-D__PIC__ -DPIC}}}
+%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} %{!D__KERNEL__: %{!DIN_GCC: %{!DIN_LIBGCC: %{!DIN_LIBGCC2: %{!nostartfiles: %{!nodefaultlibs: %{!nostdlib: %{!nostdinc: %{!nopie: %{!no-pie: %{!yet_exec: -DPIC -D__PIC__ -D__pic__} } } } } } } } } } } 
 
 *cpp_options:
 %(cpp_unique_options) %1 %{m*} %{std*} %{ansi} %{W*&pedantic*} %{w} %{f*} %{O*} %{undef}
@@ -30,7 +30,7 @@
 cc1 -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}
 
 *cc1:
-%(cc1_cpu) %{profile:-p} %{pie:%{!D__KERNEL__:%{!no-pie:%{!static: -fPIC}}}}%{!D__KERNEL__: %{!DIN_GCC: %{!DIN_LIBGCC: %{!DIN_LIBGCC2: %{!nostartfiles: %{!nostdinc: %{!nostdlib: %{!nodefaultlibs: %{!fno-stack-protector: %{!fno-stack-protector-all: -fstack-protector-all -fforce-addr} } } } } } } } } } 
+%(cc1_cpu) %{profile:-p} %{!D__KERNEL__: %{!DIN_GCC: %{!DIN_LIBGCC: %{!DIN_LIBGCC2: %{!nostartfiles: %{!nodefaultlibs: %{!nostdlib: %{!nostdinc: %{!nopie: %{!no-pie: %{!yet_exec: -fPIC} } }  %{!fno-stack-protector: %{!fno-stack-protector-all: %{!yno_propolice: -fstack-protector -fstack-protector-all} } } } } } } } } } } 
 
 *cc1_options:
 %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}} %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*} -auxbase%{c|S:%{o*:-strip %*}%{!o*: %b}}%{!c:%{!S: %b}} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi} %{v:-version} %{pg:-p} %{p} %{f*} %{undef} %{Qn:-fno-ident} %{--help:--help} %{--target-help:--target-help} %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}} %{fsyntax-only:-o %j} %{-param*}
@@ -42,7 +42,7 @@
 %{static:--start-group} %G %L %{static:--end-group}%{!static:%G}
 
 *endfile:
-%{static:crtend.o%s} %{!static:%{no-pie:crtend.o%s}} %{!D__KERNEL__:%{!static:%{!no-pie:crtendS.o%s}}} crtn.o%s
+%{static: crtend.o%s} %{shared: crtendS.o%s} %{!shared: %{!static: %{D__KERNEL__|DIN_GCC|DIN_LIBGCC|DIN_LIBGCC2|nostartfiles|nodefaultlibs|nostdlib|nostdinc: crtend.o%s} %{!D__KERNEL__: %{!DIN_GCC: %{!DIN_LIBGCC: %{!DIN_LIBGCC2: %{!nostartfiles: %{!nodefaultlibs: %{!nostdlib: %{!nostdinc: crtendS.o%s} } } } } } } } } }  crtn.o%s
 
 *link:
 %{!static:--eh-frame-hdr} -m elf_i386 %{shared:-shared}   %{!shared:     %{!ibcs:       %{!static: 	%{rdynamic:-export-dynamic} 	%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} 	%{static:-static}}}
@@ -54,7 +54,7 @@
 %{static|static-libgcc:-lgcc -lgcc_eh}%{!static:%{!static-libgcc:%{!shared:%{!shared-libgcc:-lgcc -lgcc_eh}%{shared-libgcc:-lgcc_s%M -lgcc}}%{shared:%{shared-libgcc:-lgcc_s%M}%{!shared-libgcc:-lgcc}}}}
 
 *startfile:
-%{!shared: %{pg: gcrt1.o%s} %{!pg: %{p: gcrt1.o%s} %{!p: %{profile: gcrt1.o%s} %{!profile: %{!D__KERNEL__:%{!static:%{!no-pie: Scrt1.o%s}}} %{static:crt1.o%s} %{!D__KERNEL__:%{!static:%{no-pie: crt1.o%s}}}} }}} crti.o%s %{static:crtbeginT.o%s} %{!static:%{!shared:%{no-pie:crtbegin.o%s}}} %{!D__KERNEL__:%{!no-pie:%{!static:crtbeginS.o%s}}}
+%{!shared: %{pg: gcrt1.o%s} %{!pg: %{p: gcrt1.o%s} %{!p: %{profile: gcrt1.o%s} %{!profile: %{static: crt1.o%s} %{!static: %{D__KERNEL__|DIN_GCC|DIN_LIBGCC|DIN_LIBGCC2|nostartfiles|nodefaultlibs|nostdlib|nostdinc: crt1.o%s} %{!D__KERNEL__: %{!DIN_GCC: %{!DIN_LIBGCC: %{!DIN_LIBGCC2: %{!nostartfiles: %{!nodefaultlibs: %{!nostdlib: %{!nostdinc: Scrt1.o%s} } } } } } } } } } } } }  crti.o%s %{shared: crtbeginS.o%s} %{static: crtbeginT.o%s} %{!shared: %{!static: %{D__KERNEL__|DIN_GCC|DIN_LIBGCC|DIN_LIBGCC2|nostartfiles|nodefaultlibs|nostdlib|nostdinc: crtbegin.o%s} %{!D__KERNEL__: %{!DIN_GCC: %{!DIN_LIBGCC: %{!DIN_LIBGCC2: %{!nostartfiles: %{!nodefaultlibs: %{!nostdlib: %{!nostdinc: crtbeginS.o%s} } } } } } } } } } 
 
 *switches_need_spaces:
 
@@ -116,5 +116,5 @@
 }
 
 *link_command:
-%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:    %(linker) %l %{!D__KERNEL__:%{!no-pie: %{!static: %{!shared: %{!Bshareable: %{!i: %{!r: -pie -z combreloc -z now} } } } } } } %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}    %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}    %{static:} %{L*} %(link_libgcc) %o %{!nostdlib:%{!nodefaultlibs:%(link_gcc_c_sequence)}}    %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}}
+%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:    %(linker) %l %{pie:-pie} %{!D__KERNEL__: %{!DIN_GCC: %{!DIN_LIBGCC: %{!DIN_LIBGCC2: %{!nostartfiles: %{!nodefaultlibs: %{!nostdlib: %{!nostdinc: %{!shared: %{!Bshareable: %{!i: %{!r: %{!nopie: %{!no-pie: %{!yet_exec: -pie -z combreloc -z relro -O1} } } } } } } } } } } } } } } %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}    %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}    %{static:} %{L*} %(link_libgcc) %o %{!nostdlib:%{!nodefaultlibs:%(link_gcc_c_sequence)}}    %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}}