From 0b6c2b78caec552c720fc2171224ad9483172a32 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Sat, 30 Apr 2011 10:40:09 -0700
Subject: [PATCH] Un-distinguish LDFLAGS et al for shims or modules.

---
 src/configure.ac            |  7 ++++---
 src/etc/std-makefile-prefix | 12 ++++++------
 src/microcode/achost.ac     |  7 ++++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/configure.ac b/src/configure.ac
index 1509b9aa3..3bfbe3d12 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -8,7 +8,8 @@ AC_PROG_MAKE_SET
 AC_COPYRIGHT(
 [Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-    2006, 2007, 2008, 2009, 2010 Massachusetts Institute of Technology
+    2006, 2007, 2008, 2009, 2010, 2011 Massachusetts Institute of
+    Technology
 
 This file is part of MIT/GNU Scheme.
 
@@ -121,8 +122,8 @@ AC_SUBST([DEFS])
 AC_SUBST([CFLAGS])
 AC_SUBST([CPPFLAGS])
 AC_SUBST([LDFLAGS])
-AC_SUBST([SHIM_CFLAGS])
-AC_SUBST([SHIM_LDFLAGS])
+AC_SUBST([MODULE_CFLAGS])
+AC_SUBST([MODULE_LDFLAGS])
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/src/etc/std-makefile-prefix b/src/etc/std-makefile-prefix
index 43e78da11..0c64b6248 100644
--- a/src/etc/std-makefile-prefix
+++ b/src/etc/std-makefile-prefix
@@ -1,7 +1,7 @@
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-#     2005, 2006, 2007, 2008, 2009, 2010 Massachusetts Institute of
-#     Technology
+#     2005, 2006, 2007, 2008, 2009, 2010, 2011 Massachusetts Institute
+#     of Technology
 #
 # This file is part of MIT/GNU Scheme.
 #
@@ -77,10 +77,10 @@ LDFLAGS = @LDFLAGS@
 COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CCLD) $(LDFLAGS) -o $@
 
-SHIM_CFLAGS = @SHIM_CFLAGS@
-SHIM_LDFLAGS = @SHIM_LDFLAGS@
-COMPILE_SHIM = $(COMPILE) $(SHIM_CFLAGS)
-LINK_SHIM = $(LINK) $(SHIM_LDFLAGS)
+MODULE_CFLAGS = @MODULE_CFLAGS@
+MODULE_LDFLAGS = @MODULE_LDFLAGS@
+COMPILE_SHIM = $(COMPILE) $(MODULE_CFLAGS)
+LINK_SHIM = $(LINK) $(MODULE_LDFLAGS)
 
 AUXDIR = @AUXDIR@
 
diff --git a/src/microcode/achost.ac b/src/microcode/achost.ac
index 145fdd204..8f4080735 100644
--- a/src/microcode/achost.ac
+++ b/src/microcode/achost.ac
@@ -1,6 +1,9 @@
 ### -*-M4-*-
 ###
-### Copyright (C) 2010 Massachusetts Institute of Technology
+### Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993,
+### 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+### 2005, 2006, 2007, 2008, 2009, 2010, 2011 Massachusetts Institute
+### of Technology
 ###
 ### This file is part of MIT/GNU Scheme.
 ###
@@ -197,8 +200,6 @@ if test "${DO_GCC_TESTS}" = yes; then
     fi
     MODULE_CFLAGS="${MODULE_CFLAGS} -fPIC"
     MODULE_LDFLAGS="${MODULE_LDFLAGS} -shared -fPIC"
-    SHIM_CFLAGS="${SHIM_CFLAGS} -fPIC"
-    SHIM_LDFLAGS="${SHIM_LDFLAGS} -shared -fPIC"
     AC_MSG_CHECKING([for ELF binaries])
     AC_RUN_IFELSE(
 	[AC_LANG_PROGRAM(
-- 
2.25.1