From 99dee78c2d44641ba56e5bb640d732f993b3dfa1 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 30 Dec 2020 07:39:16 -0500 Subject: all: remove $OBJTYPE from build Now that we assume pthreads, the only assembly left is in libmp and libsec. We only ever added assembly for 386. The portable C code is fine for plan9port. --- unix/make/Make.Darwin | 7 +++++++ unix/make/Make.Darwin-386 | 7 ------- unix/make/Make.Darwin-PowerMacintosh | 7 ------- unix/make/Make.FreeBSD | 6 ++++++ unix/make/Make.FreeBSD-386 | 6 ------ unix/make/Make.HP-UX | 6 ++++++ unix/make/Make.HP-UX-9000 | 6 ------ unix/make/Make.Linux | 6 ++++++ unix/make/Make.Linux-386 | 6 ------ unix/make/Make.Linux-power | 6 ------ unix/make/Make.Linux-x86_64 | 6 ------ unix/make/Make.NetBSD | 6 ++++++ unix/make/Make.NetBSD-386 | 6 ------ unix/make/Make.OSF1 | 6 ++++++ unix/make/Make.OSF1-alpha | 6 ------ unix/make/Make.OpenBSD | 6 ++++++ unix/make/Make.OpenBSD-386 | 6 ------ unix/make/Make.SunOS | 2 ++ unix/make/Make.SunOS-cc | 6 ++++++ unix/make/Make.SunOS-gcc | 6 ++++++ unix/make/Make.SunOS-sun4u | 2 -- unix/make/Make.SunOS-sun4u-cc | 6 ------ unix/make/Make.SunOS-sun4u-gcc | 6 ------ unix/make/Makefile.TOP | 4 +--- 24 files changed, 58 insertions(+), 79 deletions(-) create mode 100644 unix/make/Make.Darwin delete mode 100644 unix/make/Make.Darwin-386 delete mode 100644 unix/make/Make.Darwin-PowerMacintosh create mode 100644 unix/make/Make.FreeBSD delete mode 100644 unix/make/Make.FreeBSD-386 create mode 100644 unix/make/Make.HP-UX delete mode 100644 unix/make/Make.HP-UX-9000 create mode 100644 unix/make/Make.Linux delete mode 100644 unix/make/Make.Linux-386 delete mode 100644 unix/make/Make.Linux-power delete mode 100644 unix/make/Make.Linux-x86_64 create mode 100644 unix/make/Make.NetBSD delete mode 100644 unix/make/Make.NetBSD-386 create mode 100644 unix/make/Make.OSF1 delete mode 100644 unix/make/Make.OSF1-alpha create mode 100644 unix/make/Make.OpenBSD delete mode 100644 unix/make/Make.OpenBSD-386 create mode 100644 unix/make/Make.SunOS create mode 100644 unix/make/Make.SunOS-cc create mode 100644 unix/make/Make.SunOS-gcc delete mode 100644 unix/make/Make.SunOS-sun4u delete mode 100644 unix/make/Make.SunOS-sun4u-cc delete mode 100644 unix/make/Make.SunOS-sun4u-gcc (limited to 'unix/make') diff --git a/unix/make/Make.Darwin b/unix/make/Make.Darwin new file mode 100644 index 00000000..21ede6f2 --- /dev/null +++ b/unix/make/Make.Darwin @@ -0,0 +1,7 @@ +CC=gcc +CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I${PREFIX}/include +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O +RANLIB=ranlib diff --git a/unix/make/Make.Darwin-386 b/unix/make/Make.Darwin-386 deleted file mode 100644 index 21ede6f2..00000000 --- a/unix/make/Make.Darwin-386 +++ /dev/null @@ -1,7 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I${PREFIX}/include -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O -RANLIB=ranlib diff --git a/unix/make/Make.Darwin-PowerMacintosh b/unix/make/Make.Darwin-PowerMacintosh deleted file mode 100644 index 21ede6f2..00000000 --- a/unix/make/Make.Darwin-PowerMacintosh +++ /dev/null @@ -1,7 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I${PREFIX}/include -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O -RANLIB=ranlib diff --git a/unix/make/Make.FreeBSD b/unix/make/Make.FreeBSD new file mode 100644 index 00000000..87aa579f --- /dev/null +++ b/unix/make/Make.FreeBSD @@ -0,0 +1,6 @@ +CC=gcc +CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I$(PREFIX)/include +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O diff --git a/unix/make/Make.FreeBSD-386 b/unix/make/Make.FreeBSD-386 deleted file mode 100644 index 87aa579f..00000000 --- a/unix/make/Make.FreeBSD-386 +++ /dev/null @@ -1,6 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I$(PREFIX)/include -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.HP-UX b/unix/make/Make.HP-UX new file mode 100644 index 00000000..edbdc111 --- /dev/null +++ b/unix/make/Make.HP-UX @@ -0,0 +1,6 @@ +CC=cc +CFLAGS=-O -c -Ae -I. +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O diff --git a/unix/make/Make.HP-UX-9000 b/unix/make/Make.HP-UX-9000 deleted file mode 100644 index edbdc111..00000000 --- a/unix/make/Make.HP-UX-9000 +++ /dev/null @@ -1,6 +0,0 @@ -CC=cc -CFLAGS=-O -c -Ae -I. -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.Linux b/unix/make/Make.Linux new file mode 100644 index 00000000..1fadb5f8 --- /dev/null +++ b/unix/make/Make.Linux @@ -0,0 +1,6 @@ +CC=gcc +CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -fPIC -O2 -g -c -I. +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O diff --git a/unix/make/Make.Linux-386 b/unix/make/Make.Linux-386 deleted file mode 100644 index c1dc4109..00000000 --- a/unix/make/Make.Linux-386 +++ /dev/null @@ -1,6 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.Linux-power b/unix/make/Make.Linux-power deleted file mode 100644 index c1dc4109..00000000 --- a/unix/make/Make.Linux-power +++ /dev/null @@ -1,6 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.Linux-x86_64 b/unix/make/Make.Linux-x86_64 deleted file mode 100644 index 1fadb5f8..00000000 --- a/unix/make/Make.Linux-x86_64 +++ /dev/null @@ -1,6 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -fPIC -O2 -g -c -I. -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.NetBSD b/unix/make/Make.NetBSD new file mode 100644 index 00000000..87aa579f --- /dev/null +++ b/unix/make/Make.NetBSD @@ -0,0 +1,6 @@ +CC=gcc +CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I$(PREFIX)/include +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O diff --git a/unix/make/Make.NetBSD-386 b/unix/make/Make.NetBSD-386 deleted file mode 100644 index 87aa579f..00000000 --- a/unix/make/Make.NetBSD-386 +++ /dev/null @@ -1,6 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I$(PREFIX)/include -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.OSF1 b/unix/make/Make.OSF1 new file mode 100644 index 00000000..3d45279b --- /dev/null +++ b/unix/make/Make.OSF1 @@ -0,0 +1,6 @@ +CC=cc +CFLAGS+=-g -c -I. +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O diff --git a/unix/make/Make.OSF1-alpha b/unix/make/Make.OSF1-alpha deleted file mode 100644 index 3d45279b..00000000 --- a/unix/make/Make.OSF1-alpha +++ /dev/null @@ -1,6 +0,0 @@ -CC=cc -CFLAGS+=-g -c -I. -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.OpenBSD b/unix/make/Make.OpenBSD new file mode 100644 index 00000000..87aa579f --- /dev/null +++ b/unix/make/Make.OpenBSD @@ -0,0 +1,6 @@ +CC=gcc +CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I$(PREFIX)/include +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O diff --git a/unix/make/Make.OpenBSD-386 b/unix/make/Make.OpenBSD-386 deleted file mode 100644 index 87aa579f..00000000 --- a/unix/make/Make.OpenBSD-386 +++ /dev/null @@ -1,6 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I$(PREFIX)/include -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.SunOS b/unix/make/Make.SunOS new file mode 100644 index 00000000..a306597b --- /dev/null +++ b/unix/make/Make.SunOS @@ -0,0 +1,2 @@ +include Make.SunOS-$(CC) +NAN=nan64.$O diff --git a/unix/make/Make.SunOS-cc b/unix/make/Make.SunOS-cc new file mode 100644 index 00000000..829301de --- /dev/null +++ b/unix/make/Make.SunOS-cc @@ -0,0 +1,6 @@ +CC=cc +CFLAGS+=-g -c -I. -O +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O diff --git a/unix/make/Make.SunOS-gcc b/unix/make/Make.SunOS-gcc new file mode 100644 index 00000000..5c415948 --- /dev/null +++ b/unix/make/Make.SunOS-gcc @@ -0,0 +1,6 @@ +CC=gcc +CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c +O=o +AR=ar +ARFLAGS=rvc +NAN=nan64.$O diff --git a/unix/make/Make.SunOS-sun4u b/unix/make/Make.SunOS-sun4u deleted file mode 100644 index c5fe67b8..00000000 --- a/unix/make/Make.SunOS-sun4u +++ /dev/null @@ -1,2 +0,0 @@ -include Make.SunOS-sun4u-$(CC) -NAN=nan64.$O diff --git a/unix/make/Make.SunOS-sun4u-cc b/unix/make/Make.SunOS-sun4u-cc deleted file mode 100644 index 829301de..00000000 --- a/unix/make/Make.SunOS-sun4u-cc +++ /dev/null @@ -1,6 +0,0 @@ -CC=cc -CFLAGS+=-g -c -I. -O -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Make.SunOS-sun4u-gcc b/unix/make/Make.SunOS-sun4u-gcc deleted file mode 100644 index 5c415948..00000000 --- a/unix/make/Make.SunOS-sun4u-gcc +++ /dev/null @@ -1,6 +0,0 @@ -CC=gcc -CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -O=o -AR=ar -ARFLAGS=rvc -NAN=nan64.$O diff --git a/unix/make/Makefile.TOP b/unix/make/Makefile.TOP index 516937e0..5feb1d47 100644 --- a/unix/make/Makefile.TOP +++ b/unix/make/Makefile.TOP @@ -1,18 +1,16 @@ # this works in gnu make SYSNAME:=${shell uname} -OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'} # this works in bsd make SYSNAME!=uname -OBJTYPE!=uname -m | sed 's;i.86;386;; s;amd64;x864_64;; s;/.*;;; s; ;;g' # the gnu rules will mess up bsd but not vice versa, # hence the gnu rules come first. RANLIB=true -include Make.$(SYSNAME)-$(OBJTYPE) +include Make.$(SYSNAME) PREFIX=/usr/local -- cgit v1.2.3