From 09e967c2d732783b2579e4e120cd9b608404cb00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Wed, 4 Jun 2003 18:31:57 +0000
Subject: Merge from R9_0-AMD64, most notably: - AMD64 support to
 insmod-busybox, minilibc, et al. - Sync with insmod-modutils 2.4.19 something
 but everyone should use   dietlibc nowadays - Factor out compilation and
 prefix with $(DIET) for dietlibc builds - 64-bit & varargs fixes

---
 mdk-stage1/insmod-busybox/Makefile | 36 +++++++-----------------------------
 mdk-stage1/insmod-busybox/insmod.c |  2 +-
 2 files changed, 8 insertions(+), 30 deletions(-)

(limited to 'mdk-stage1/insmod-busybox')

diff --git a/mdk-stage1/insmod-busybox/Makefile b/mdk-stage1/insmod-busybox/Makefile
index a81740681..236874f96 100644
--- a/mdk-stage1/insmod-busybox/Makefile
+++ b/mdk-stage1/insmod-busybox/Makefile
@@ -13,53 +13,31 @@ top_dir = ..
 include $(top_dir)/Makefile.common
 
 
-all: insmod insmod-DIET libinsmod.a libinsmod-DIET.a
+all: insmod libinsmod.a
 
 clean:
-	rm -f *.o insmod insmod-DIET libinsmod.a libinsmod-DIET.a
+	rm -f *.o insmod libinsmod.a
 
 
 FLAGS = -c -Wall -Os -fomit-frame-pointer -D_GNU_SOURCE -DBB_VER='"0.60.5"' -DBB_BT='"2003.04.16-15:25+0000"'
 
 
 insmod: insmod-frontend.o insmod.o utility-standalone.o
-	gcc -o $@ $^
+	$(DIET) gcc -o $@ $^
 	$(STRIPCMD) $@
 
-insmod-DIET: insmod-frontend-DIET.o insmod-DIET.o utility-standalone-DIET.o
-	gcc $(DIETLIBC_LDFLAGS_STAGE1) -o $@ $^ $(DIETLIBC_LIBC)
-	$(STRIPCMD) $@
-
-
 libinsmod.a: insmod.o utility.o
 	ar cru $@ $^
 	ranlib $@
 
-libinsmod-DIET.a: insmod-DIET.o utility-DIET.o
-	ar cru $@ $^
-	ranlib $@
-
 insmod-frontend.o: insmod-frontend.c busybox.h
-	gcc $(FLAGS) $(GLIBC_INCLUDES) insmod-frontend.c
-
-insmod-frontend-DIET.o: insmod-frontend.c busybox.h
-	gcc $(FLAGS) $(DIETLIBC_INCLUDES) -o $@ insmod-frontend.c
+	$(DIET) gcc $(FLAGS) $(INCLUDES) insmod-frontend.c
 
 utility.o: utility.c busybox.h
-	gcc $(FLAGS) $(GLIBC_INCLUDES) utility.c
-
-utility-DIET.o: utility.c busybox.h
-	gcc $(FLAGS) $(DIETLIBC_INCLUDES) -o $@ utility.c
+	$(DIET) gcc $(FLAGS) $(INCLUDES) utility.c
 
 utility-standalone.o: utility.c busybox.h
-	gcc $(FLAGS) $(GLIBC_INCLUDES) -o $@ -D_STANDALONE_ utility.c
-
-utility-standalone-DIET.o: utility.c busybox.h
-	gcc $(FLAGS) $(DIETLIBC_INCLUDES) -o $@ -D_STANDALONE_ utility.c
+	$(DIET) gcc $(FLAGS) $(INCLUDES) -o $@ -D_STANDALONE_ utility.c
 
 insmod.o: insmod.c busybox.h
-	gcc $(FLAGS) $(GLIBC_INCLUDES) insmod.c
-
-insmod-DIET.o: insmod.c busybox.h
-	gcc $(FLAGS) $(DIETLIBC_INCLUDES) -o $@ insmod.c
-
+	$(DIET) gcc $(FLAGS) $(INCLUDES) insmod.c
diff --git a/mdk-stage1/insmod-busybox/insmod.c b/mdk-stage1/insmod-busybox/insmod.c
index 6f3b592e4..e6e5b8f5f 100644
--- a/mdk-stage1/insmod-busybox/insmod.c
+++ b/mdk-stage1/insmod-busybox/insmod.c
@@ -82,7 +82,7 @@
 #endif
 
 /* FIXME: Remove once we switched to dietlibc 0.22 */
-#if 1
+#if 0
 
 #undef new_sys_init_module
 #define __NR_new_sys_init_module  __NR_init_module
-- 
cgit v1.2.1