From 09e967c2d732783b2579e4e120cd9b608404cb00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= 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/Makefile.common | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mdk-stage1/Makefile.common') diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index 7506c1381..cc9e602da 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -31,6 +31,13 @@ L = GLIBC endif ifeq (ppc, $(ARCH)) L = GLIBC +endif +ifeq (x86_64, $(ARCH)) +#L = GLIBC +endif + +ifeq (DIETLIBC, $(L)) +DIET = $(top_dir)/dietlibc/bin-$(ARCH)/diet endif @@ -46,11 +53,11 @@ GLIBC_INCLUDES = -I. -I$(top_dir)/bzlib INCLUDES = $($(L)_INCLUDES) GLIBC_LDFLAGS_STAGE1 = -static -DIETLIBC_LDFLAGS_STAGE1 = -nostdlib $(top_dir)/dietlibc/bin-$(ARCH)/start.o +DIETLIBC_LDFLAGS_STAGE1 = -nostdlib LDFLAGS_STAGE1 = $($(L)_LDFLAGS_STAGE1) GLIBC_LIBC = -DIETLIBC_LIBC = $(top_dir)/dietlibc/bin-$(ARCH)/dietlibc.a +DIETLIBC_LIBC = STAGE1_LIBC = $($(L)_LIBC) STRIPCMD = strip -R .note -R .comment -- cgit v1.2.1