From 43e8303af45614c93d809f5a55632e539bc2e936 Mon Sep 17 00:00:00 2001
From: Stas Boukarev <stassats@gmail.com>
Date: Fri, 10 Apr 2015 21:07:30 +0300
Subject: [PATCH] Prune old and used stuff from makefiles.

---
 contrib/asdf-module.mk             |  9 +++------
 src/runtime/Config.alpha-linux     |  2 +-
 src/runtime/Config.alpha-osf1      |  3 +--
 src/runtime/Config.generic-openbsd |  1 -
 src/runtime/Config.sparc-linux     |  2 +-
 src/runtime/Config.sparc-sunos     |  2 +-
 src/runtime/Config.x86-64-linux    |  1 -
 src/runtime/Config.x86-64-netbsd   |  6 ------
 src/runtime/Config.x86-64-sunos    |  3 ---
 src/runtime/Config.x86-64-win32    | 10 ----------
 src/runtime/Config.x86-linux       |  1 -
 src/runtime/Config.x86-sunos       |  2 --
 src/runtime/Config.x86-win32       | 11 -----------
 src/runtime/GNUmakefile            |  6 ++----
 14 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index e211f0c97..df134eafa 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -15,9 +15,6 @@ ifeq (SunOS,$(UNAME))
   PATH:=/usr/xpg4/bin:${PATH}
 endif
 ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
-  EXTRA_CFLAGS=-mno-cygwin
-  # GCC 4.x doesn't accept -mno-cygwin.
-  CC:=gcc-3
   # SBCL can't read cygwin symlinks, and cygwin likes to symlink
   # gcc.  To further complicate things, SBCL can't handle cygwin
   # paths, either.
@@ -27,9 +24,9 @@ ifeq (Linux,$(UNAME))
   EXTRA_CFLAGS=-D_GNU_SOURCE
 endif
 
-export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
+export CC SBCL EXTRA_CFLAGS
 
-all: $(FASL) $(ASD) $(EXTRA_ALL_TARGETS)
+all: $(FASL) $(ASD)
 
 $(FASL)::
 	$(MAKE) -C ../asdf
@@ -45,5 +42,5 @@ test: $(FASL) $(ASD)
 
 # KLUDGE: There seems to be no portable way to tell tar to not to
 # preserve owner, so chown after installing for the current user.
-install: $(EXTRA_INSTALL_TARGETS)
+install:
 	cp $(FASL) $(ASD) "$(BUILD_ROOT)$(INSTALL_DIR)"
diff --git a/src/runtime/Config.alpha-linux b/src/runtime/Config.alpha-linux
index b8e44f3fa..25af858ca 100644
--- a/src/runtime/Config.alpha-linux
+++ b/src/runtime/Config.alpha-linux
@@ -9,7 +9,7 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-LD = ld -taso
+#LD = ld -taso ;; $LD is no longer used anywhere, should that be moved below?
 LINKFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic
 NM = ./linux-nm
 
diff --git a/src/runtime/Config.alpha-osf1 b/src/runtime/Config.alpha-osf1
index 3d6ad9fb0..c16b9e34e 100644
--- a/src/runtime/Config.alpha-osf1
+++ b/src/runtime/Config.alpha-osf1
@@ -11,8 +11,7 @@
 
 CFLAGS += -Dosf1 -O0 -g -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500
 CFLAGS += -msg_disable newlocale
-ASFLAGS += -Dosf1 #-ULANGUAGE_ASSEMBLY
-LD = ld -xtaso
+#LD = ld -xtaso ;; $LD is no longer used anywhere, should that be moved below?
 LINKFLAGS = -non_shared # dynamic -v -g  -Wl,-T  -Wl,ld-script.alpha-linux
 # Digital^WCompaq^WHP's cc declares `static inline' functions to exist
 # in multiple places in the binary; we add the '-g' flag to suppress all
diff --git a/src/runtime/Config.generic-openbsd b/src/runtime/Config.generic-openbsd
index 193703e91..93023740a 100644
--- a/src/runtime/Config.generic-openbsd
+++ b/src/runtime/Config.generic-openbsd
@@ -17,7 +17,6 @@ OS_LIBS += -lutil
 ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e -nopie),)
 CFLAGS += -fno-pie
 LINKFLAGS += -nopie
-LDFLAGS += -nopie
 endif
 
 ifdef LISP_FEATURE_SB_THREAD
diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-linux
index 224ee3355..15fc1ab09 100644
--- a/src/runtime/Config.sparc-linux
+++ b/src/runtime/Config.sparc-linux
@@ -9,7 +9,7 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-ASFLAGS = -g -Wall -Wa,-xarch=v8plus
+#ASFLAGS = -g -Wall -Wa,-xarch=v8plus ;; this is not used anywhere
 LINKFLAGS += -v -rdynamic
 NM = ./linux-nm
 
diff --git a/src/runtime/Config.sparc-sunos b/src/runtime/Config.sparc-sunos
index 681a5027b..802b0cbd6 100644
--- a/src/runtime/Config.sparc-sunos
+++ b/src/runtime/Config.sparc-sunos
@@ -11,7 +11,7 @@
 
 CC = gcc
 CFLAGS += -DSVR4 -D_REENTRANT
-ASFLAGS = -g -Wall -DSVR4 -Wa,-xarch=v8plus
+#ASFLAGS = -g -Wall -DSVR4 -Wa,-xarch=v8plus ;; this is not used anywhere
 LINKFLAGS += -v
 NM = nm -t x -p 
 
diff --git a/src/runtime/Config.x86-64-linux b/src/runtime/Config.x86-64-linux
index 204eaffbb..b67403fa6 100644
--- a/src/runtime/Config.x86-64-linux
+++ b/src/runtime/Config.x86-64-linux
@@ -50,7 +50,6 @@ GC_SRC = gencgc.c
 ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e nopie),)
 CFLAGS += -fno-pie
 LINKFLAGS += -nopie
-LDFLAGS += -nopie
 endif
 
 # Nothing to do for after-grovel-headers.
diff --git a/src/runtime/Config.x86-64-netbsd b/src/runtime/Config.x86-64-netbsd
index 27e7beb4a..18cc58798 100644
--- a/src/runtime/Config.x86-64-netbsd
+++ b/src/runtime/Config.x86-64-netbsd
@@ -18,10 +18,4 @@ ifdef LISP_FEATURE_SB_THREAD
   OS_LIBS += -lpthread -lrt
 endif
 
-# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS?
-# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the
-# dladdr test in tools-for-build/ to fail.
-
 LINKFLAGS += -export-dynamic
-LDFLAGS += -export-dynamic
-
diff --git a/src/runtime/Config.x86-64-sunos b/src/runtime/Config.x86-64-sunos
index 6f3407453..d224eaa84 100644
--- a/src/runtime/Config.x86-64-sunos
+++ b/src/runtime/Config.x86-64-sunos
@@ -1,14 +1,11 @@
 CC=gcc
 CFLAGS = -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-ASFLAGS = -m64 -Wall
-LD = ld
 LINKFLAGS = -m64 -g
 NM = nm -xgp
 GREP = ggrep
 
 #CC=/opt/SunStudioExpress/bin/cc
 #CFLAGS = -xarch=generic64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-#ASFLAGS = -xarch=generic64 -Wall
 
 ASSEM_SRC = x86-64-assem.S ldso-stubs.S
 ARCH_SRC = x86-64-arch.c
diff --git a/src/runtime/Config.x86-64-win32 b/src/runtime/Config.x86-64-win32
index c4a2dba80..4d3027d73 100644
--- a/src/runtime/Config.x86-64-win32
+++ b/src/runtime/Config.x86-64-win32
@@ -13,7 +13,6 @@ ASSEM_SRC = x86-64-assem.S
 ARCH_SRC = x86-64-arch.c
 
 OS_SRC = win32-os.c x86-64-win32-os.c os-common.c pthreads_win32.c
-OS_OBJS = # sbcl-win.res.o
 
 # The "--Wl,--export-dynamic" flags are here to help people
 # experimenting with callbacks from C to SBCL, by allowing linkage to
@@ -43,16 +42,7 @@ CFLAGS =  -g -W -Wall \
        -O5 -m64 -DWINVER=0x0501 \
        -D__W32API_USE_DLLIMPORT__
 
-ASFLAGS = $(CFLAGS)
-
-CPP = cpp
 CC = gcc
-LD = ld
-NM = nm
-RC = windres
-
-%.res.o:	%.rc
-	$(RC) -o "$@" "$<"
 
 # Nothing to do for after-grovel-headers.
 .PHONY: after-grovel-headers
diff --git a/src/runtime/Config.x86-linux b/src/runtime/Config.x86-linux
index 117630b6a..e8378b0f1 100644
--- a/src/runtime/Config.x86-linux
+++ b/src/runtime/Config.x86-linux
@@ -46,7 +46,6 @@ endif
 ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e nopie),)
 CFLAGS += -fno-pie
 LINKFLAGS += -nopie
-LDFLAGS += -nopie
 endif
 
 GC_SRC = gencgc.c
diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos
index b297d3ef6..3074b1b45 100644
--- a/src/runtime/Config.x86-sunos
+++ b/src/runtime/Config.x86-sunos
@@ -11,8 +11,6 @@
 
 CC=gcc
 CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-ASFLAGS = -Wall
-LD = ld
 NM = nm -xgp
 GREP = ggrep
 
diff --git a/src/runtime/Config.x86-win32 b/src/runtime/Config.x86-win32
index 232aaf8d3..f3d8695ac 100644
--- a/src/runtime/Config.x86-win32
+++ b/src/runtime/Config.x86-win32
@@ -43,18 +43,7 @@ CFLAGS = -g -Wall -O3 \
 # We assume Windows ABI 4-byte alignment, but GCC decided to change to
 # 16-byte alignment
 
-ASFLAGS = $(CFLAGS)
-
-CPP = cpp
 CC = gcc
-LD = ld
-NM = nm
-
-ifneq ($(findstring cygwin,$(shell $(CC) -dumpmachine)),)
-LINK_FLAGS := $(LINK_FLAGS) -Wl,-mno-cygwin
-OS_LIBS := $(OS_LIBS) -mno-cygwin
-CFLAGS := $(CFLAGS) -mno-cygwin
-endif
 
 # Nothing to do for after-grovel-headers.
 .PHONY: after-grovel-headers
diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
index 3d75800b0..ac7326a14 100644
--- a/src/runtime/GNUmakefile
+++ b/src/runtime/GNUmakefile
@@ -17,7 +17,6 @@ TARGET=sbcl
 # Defaults which might be overridden or modified by values in the
 # Config file. Most of them are same on most systems right now.
 # If you need to override one of these, do it in Config.
-LD = ld
 LINKFLAGS = -g
 NM = nm -gp
 DEPEND_FLAGS = -MM
@@ -26,7 +25,6 @@ GREP = grep
 include ../../output/prefix.def
 
 CFLAGS = -g -Wall -Wsign-compare -O3
-ASFLAGS = $(CFLAGS)
 CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
 
 # Give make access to the target Lisp features.
@@ -37,7 +35,7 @@ include genesis/Makefile.features
 # Config-foo file for setup foo, then arrange for Config to be a
 # symlink to Config-foo.
 # Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC,
-# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
+# OS_SRC, OS_LIBS, OS_CLEAN_FILES
 include Config
 
 COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
@@ -51,7 +49,7 @@ C_SRC = $(COMMON_SRC) ${ARCH_SRC} ${OS_SRC} ${GC_SRC}
 
 SRCS = $(C_SRC) ${ASSEM_SRC}
 
-OBJS = $(C_SRC:.c=.o) $(ASSEM_SRC:.S=.o) ${OS_OBJS}
+OBJS = $(C_SRC:.c=.o) $(ASSEM_SRC:.S=.o)
 
 LIBS = ${OS_LIBS} -lm
 
-- 
2.11.4.GIT