[Linux-ia64] [PATCH] Fix for kernel DRM build

[Uros Prestor <uros@turbolinux.com>]

[-- Attachment #1: Type: text/plain, Size: 856 bytes --]

When building the latest 2.4.0-010109 kernel with DRI support enabled,
I got the following link-time error:

     ld: drivers/char/drm/drm.o: linking 64-bit files with 32-bit
     files
     ld: drivers/char/drm/drm.o: linking constant-gp files with
     non-constant-gp files

It turns out that drm.o was built as follows:

     rm -f drmlib.a
     ar  rcs drmlib.a init.o memory.o proc.o auth.o context.o
     drawable.o bufs.o lists.o lock.o ioctl.o fops.o vm.o dma.o
     ctxbitmap.o
     rm -f drm.o
     ld  -r -o drm.o drmlib.a

Looks like the ar output confuses the linker.  I don't even know if this
is supposed to work with the current toolchain.  In any case, if you
remove the ar step and use ld -r directly the problem disappears.  The
enclosed patch fixes the DRI Makefile to remove the ar step.

Uros.

--
Uros Prestor
uros@turbolinux.com



[-- Attachment #2: linux-2.4.0-ia64-drm-build.patch --]
[-- Type: text/plain, Size: 931 bytes --]

diff -ruN linux-2.4.0-010109/drivers/char/drm/Makefile linux-2.4.0-010109.drm/drivers/char/drm/Makefile
--- linux-2.4.0-010109/drivers/char/drm/Makefile	Thu Jan  4 13:07:01 2001
+++ linux-2.4.0-010109.drm/drivers/char/drm/Makefile	Tue Jan  9 13:43:21 2001
@@ -63,9 +63,9 @@
 lib-objs-mod := $(patsubst %.o,%-mod.o,$(lib-objs))
 
 ifdef MAKING_MODULES
-  lib = drmlib-mod.a
+  lib = drmlib-mod.o
 else
-  obj-y += drmlib.a
+  obj-y += drmlib.o
 endif
 
 include $(TOPDIR)/Rules.make
@@ -73,13 +73,11 @@
 $(patsubst %.o,%.c,$(lib-objs-mod)): 
 	@ln -sf $(subst -mod,,$@) $@
 
-drmlib-mod.a: $(lib-objs-mod)
-	rm -f $@
-	$(AR) $(EXTRA_ARFLAGS) rcs $@ $(lib-objs-mod)
+drmlib-mod.o: $(lib-objs-mod)
+	$(LD) -r -o $@ $(lib-objs-mod)
 
-drmlib.a: $(lib-objs)
-	rm -f $@
-	$(AR) $(EXTRA_ARFLAGS) rcs $@ $(lib-objs)
+drmlib.o: $(lib-objs)
+	$(LD) -r -o $@ $(lib-objs)
 
 gamma.o: $(gamma-objs) $(lib)
 	$(LD) -r -o $@ $(gamma-objs) $(lib)