From c60a8a994f74eb1bb3dff3bc47c38c727500c9f6 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Tue, 11 Oct 2005 19:42:32 +0000
Subject: Undo size optimizing patch that does not work with gcc-4.1-head,
 reported by sjhill, thanks cow for testing

---
 libcrypt/Makefile | 11 +++++++++--
 libutil/Makefile  | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/libcrypt/Makefile b/libcrypt/Makefile
index 86781e4c5..a4b8f5980 100644
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -39,10 +39,13 @@ else
 all: $(AR_LIB_NAME)
 endif
 
-$(AR_LIB_NAME): $(LIB_NAME).o
+# psm: 20051007 gcc-4.1-head optimizes crypt()/__des_crypt() away
+# $(AR_LIB_NAME): $(LIB_NAME).o
+
+$(AR_LIB_NAME): $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $<
+	$(AR) $(ARFLAGS) $@ $^
 
 $(SO_LIB_NAME): $(AR_LIB_NAME)
 	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
@@ -57,5 +60,9 @@ $(LIB_NAME).o: $(CSRC)
 	$(CC) $(CFLAGS) -o $@ -c $^
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
+$(OBJS): %.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
 clean:
 	$(RM) *.o *~ core
diff --git a/libutil/Makefile b/libutil/Makefile
index e825b2aba..db440dbf1 100644
--- a/libutil/Makefile
+++ b/libutil/Makefile
@@ -42,10 +42,13 @@ else
 all: $(AR_LIB_NAME)
 endif
 
-$(AR_LIB_NAME): $(LIB_NAME).o
+# psm: 20051007 gcc-4.1-head optimizes crypt()/__des_crypt() away
+# $(AR_LIB_NAME): $(LIB_NAME).o
+
+$(AR_LIB_NAME): $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $<
+	$(AR) $(ARFLAGS) $@ $^
 
 $(SO_LIB_NAME): $(AR_LIB_NAME)
 	$(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
@@ -60,5 +63,9 @@ $(LIB_NAME).o: $(CSRC)
 	$(CC) $(CFLAGS) -o $@ -c $^
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
+$(OBJS): %.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
 clean:
 	$(RM) *.o *~ core
-- 
cgit v1.2.3