Commit 34413fca authored by Andy Polyakov's avatar Andy Polyakov
Browse files

OpenBSD fix-up for new a.out targets. OpenBSD .s.o rule is busted...

parent ec38ddc7

crypto/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl 
	$(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@

x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl

	$(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@

x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl

	$(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) > $@

x86cpuid-out.o: x86cpuid.pl perlasm/x86asm.pl

	$(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) | as -o $@



amd64cpuid.s: amd64cpuid.pl

	$(PERL) amd64cpuid.pl $@

crypto/bf/Makefile.ssl

+3 −3
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ asm/bx86-elf.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 
asm/bx86-cof.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) bf-586.pl coff $(CFLAGS) $(PROCESSOR) > ../$@)

# a.out

asm/bx86-out.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) bf-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)

asm/bx86-out.o: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) bf-586.pl a.out $(CFLAGS) $(PROCESSOR) | as -o ../$@)



files:

	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
@@ -93,7 +93,7 @@ dclean: 
	mv -f Makefile.new $(MAKEFILE)



clean:

	rm -f asm/bx86unix.cpp asm/*-[elf|cof|out].* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

	rm -f asm/bx86unix.cpp asm/*.s *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff



# DO NOT DELETE THIS LINE -- make depend depends on it.

crypto/bn/Makefile.ssl

+5 −5
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ asm/bn86-cof.s: asm/bn-586.pl ../perlasm/x86asm.pl 
asm/co86-cof.s: asm/co-586.pl ../perlasm/x86asm.pl

	(cd asm; $(PERL) co-586.pl coff $(CFLAGS) > ../$@)

# a.out

asm/bn86-out.s: asm/bn-586.pl ../perlasm/x86asm.pl

	(cd asm; $(PERL) bn-586.pl a.out $(CFLAGS) > ../$@)

asm/co86-out.s: asm/co-586.pl ../perlasm/x86asm.pl

	(cd asm; $(PERL) co-586.pl a.out $(CFLAGS) > ../$@)

asm/bn86-out.o: asm/bn-586.pl ../perlasm/x86asm.pl

	(cd asm; $(PERL) bn-586.pl a.out $(CFLAGS) | as -o ../$@)

asm/co86-out.o: asm/co-586.pl ../perlasm/x86asm.pl

	(cd asm; $(PERL) co-586.pl a.out $(CFLAGS) | as -o ../$@)



asm/sparcv8.o: asm/sparcv8.S
@@ -146,7 +146,7 @@ dclean: 
	mv -f Makefile.new $(MAKEFILE)



clean:

	rm -f asm/co86unix.cpp asm/bn86unix.cpp asm/*-[elf|cof|out].* asm/ia64.[so] *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s

	rm -f asm/co86unix.cpp asm/bn86unix.cpp asm/*-elf.* asm/*-cof.* asm/*-out.* asm/ia64.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s



# DO NOT DELETE THIS LINE -- make depend depends on it.

crypto/cast/Makefile.ssl

+3 −3
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ asm/cx86-elf.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 
asm/cx86-cof.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) cast-586.pl coff $(CLAGS) $(PROCESSOR) > ../$@)

# a.out

asm/cx86-out.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) cast-586.pl a.out $(CLAGS) $(PROCESSOR) > ../$@)

asm/cx86-out.o: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) cast-586.pl a.out $(CLAGS) $(PROCESSOR) | as -o ../$@)



files:

	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
@@ -94,7 +94,7 @@ dclean: 
	mv -f Makefile.new $(MAKEFILE)



clean:

	rm -f asm/cx86unix.cpp asm/*-[elf|cof|out].* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

	rm -f asm/cx86unix.cpp asm/*.s *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff



# DO NOT DELETE THIS LINE -- make depend depends on it.

crypto/des/Makefile.ssl

+5 −26
Original line number Diff line number Diff line
@@ -80,31 +80,10 @@ asm/dx86-cof.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 
asm/yx86-cof.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) crypt586.pl coff $(CFLAGS) > ../$@)

# a.out

asm/dx86-out.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) des-586.pl a.out $(CFLAGS) > ../$@)

asm/yx86-out.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) crypt586.pl a.out $(CFLAGS) > ../$@)





# a.out

asm/dx86-out.o: asm/dx86unix.cpp

	$(CPP) -DOUT asm/dx86unix.cpp | as -o asm/dx86-out.o



asm/yx86-out.o: asm/yx86unix.cpp

	$(CPP) -DOUT asm/yx86unix.cpp | as -o asm/yx86-out.o



# bsdi

asm/dx86bsdi.o: asm/dx86unix.cpp

	$(CPP) -DBSDI asm/dx86unix.cpp | sed 's/ :/:/' | as -o asm/dx86bsdi.o



asm/yx86bsdi.o: asm/yx86unix.cpp

	$(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o



asm/dx86unix.cpp: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp)



asm/yx86unix.cpp: asm/crypt586.pl ../perlasm/x86asm.pl

	(cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp)

asm/dx86-out.o: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) des-586.pl a.out $(CFLAGS) | as -o ../$@)

asm/yx86-out.o: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	(cd asm; $(PERL) crypt586.pl a.out $(CFLAGS) | as -o ../$@)



files:

	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
@@ -140,7 +119,7 @@ dclean: 
	mv -f Makefile.new $(MAKEFILE)



clean:

	rm -f asm/dx86unix.cpp asm/yx86unix.cpp asm/*-[elf|cof|out].* *.o asm/*.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff

	rm -f asm/dx86unix.cpp asm/yx86unix.cpp asm/*.s *.o asm/*.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff



# DO NOT DELETE THIS LINE -- make depend depends on it.