From 37c4486d4f7a970fd82d4b57936f0f137df09a01 Mon Sep 17 00:00:00 2001 From: crc Date: Sat, 19 Jun 2021 14:41:06 +0000 Subject: [PATCH] nga-c (non-libc): openbsd & freebsd on amd64 use same assembly portion now FossilOrigin-Name: 5e9cb1051c37c681364157959dbe69f6c1bbc7e2e84cb21071242d7deb75fff0 --- vm/nga-c-no-libc/Makefile | 13 ++++++------- vm/nga-c-no-libc/{openbsd.s => bsd-amd64.s} | 0 2 files changed, 6 insertions(+), 7 deletions(-) rename vm/nga-c-no-libc/{openbsd.s => bsd-amd64.s} (100%) diff --git a/vm/nga-c-no-libc/Makefile b/vm/nga-c-no-libc/Makefile index d6093a0..0ead6c5 100644 --- a/vm/nga-c-no-libc/Makefile +++ b/vm/nga-c-no-libc/Makefile @@ -18,21 +18,20 @@ clean: bsd-i386: nasm -f elf bsd-i386.s -bsd-amd64: - nasm -f elf64 bsd-amd64.s +bsd-amd64.o: bsd-amd64.s + cc -c bsd-amd64.s -o bsd-amd64.o freebsd-i386: common bsd-i386 cc -m32 -c retro.c ld -nostdlib -m elf_i386_fbsd bsd-i386.o retro.o -o bin/retro -freebsd-amd64: common bsd-amd64 +freebsd-amd64: common bsd-amd64.o cc -m64 -c retro.c - ld -nostdlib -m elf_x86_64_fbsd bsd-amd64.o retro.o -o bin/retro + ld -nostdlib -no-pie -m elf_x86_64_fbsd bsd-amd64.o retro.o -o bin/retro -openbsd-amd64: common +openbsd-amd64: common bsd-amd64.o cc -m64 -c retro.c - as openbsd.s -o openbsd.o - ld -nostdlib -no-pie -m elf_x86_64 openbsd.o retro.o -o bin/retro + ld -nostdlib -no-pie -m elf_x86_64 bsd-amd64.o retro.o -o bin/retro macos-amd64: common cc -m64 -fno-pie -c retro.c diff --git a/vm/nga-c-no-libc/openbsd.s b/vm/nga-c-no-libc/bsd-amd64.s similarity index 100% rename from vm/nga-c-no-libc/openbsd.s rename to vm/nga-c-no-libc/bsd-amd64.s