From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Hicks Date: Mon, 24 Nov 2003 17:09:40 +0000 Subject: [PATCH] ia64 fixes MIME-Version: 1 Content-Type: multipart/mixed; boundary="=-37KsDkBNq3CnIbsDY547" Message-Id: List-Id: References: In-Reply-To: To: linux-hotplug@vger.kernel.org --=-37KsDkBNq3CnIbsDY547 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Greg, I currently need the attached patch to get udev to even compile againt klibc. I think there are still problems with the CALLOUT pipe failing.=20 It's likely klibc's fault. I'll investigate that this afternoon. My makefile-foo is probably sub-par. If someone could figure out a good way to get things right for 64bit platforms, then that would be good. I'm not entirely sure why I had to change $(GCC) to $(LD) in the link step. If I don't I get a warning: /usr/bin/ld: Warning: type of symbol 'errno' changed from 1 to 6 in /usr/lib/gcc-lib/ia64-linux/3.3.2/../../../libc.a(errno.o) Maybe we're missing a flag on the final link, while using $(GCC)? The old Makefile.klibc used $(LD), which allowed me to track down this problem. thanks, mh --=20 Martin Hicks || mort@bork.org || PGP/GnuPG: 0x4C7F2BEE # This is a BitKeeper generated patch for the following project: # Project Name: udev # This patch format is intended for GNU patch command version 2.5 or higher= . # This patch includes the following deltas: # ChangeSet 1.199 -> 1.200 =20 # Makefile 1.34 -> 1.35 =20 # tdb/tdb.h 1.1 -> 1.2 =20 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/11/24 mort@green.i.bork.org 1.200 # -Fixes for 64 bit platform. # -I also had to change the makefile to use the linker on the final step to= avoid # an error on ia64. # -Included signal.h in tdb/tdb.h to fix a compile problem for ia64. # -------------------------------------------- # diff -Nru a/Makefile b/Makefile --- a/Makefile Mon Nov 24 12:03:31 2003 +++ b/Makefile Mon Nov 24 12:03:31 2003 @@ -65,6 +65,9 @@ ARCH :=3D ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' = -e 's/sparc.*/sparc/' \ -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/ppc/powerpc/g'} =20 +# Defaults to 32-bit. +BITS :=3D 32 + # code taken from uClibc to determine the gcc include dir GCCINCDIR :=3D ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*= \)/\1include/gp"} =20 @@ -93,6 +96,10 @@ CFLAGS+=3D-pipe endif =20 +ifeq ($(strip $(ARCH)),ia64) + BITS=3D64 +endif + # if DEBUG is enabled, then we do not strip or optimize ifeq ($(strip $(DEBUG)),true) CFLAGS +=3D $(WARNINGS) -O1 -g -DDEBUG -D_GNU_SOURCE @@ -117,8 +124,10 @@ =20 =20 CRT0 =3D $(KLIBC_DIR)/crt0.o - LIBC =3D $(ARCH_LIB_OBJS) $(LIB_OBJS) - CFLAGS +=3D -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINC= DIR) -Iklibc/linux/include -D__KLIBC__ + LIBC =3D $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) + CFLAGS +=3D -nostdinc -I$(INCLUDE_DIR) -I$(KLIBC_DIR)/arch/$(ARCH)/includ= e \ + -I$(INCLUDE_DIR)/bits$(BITS) -I$(GCCINCDIR) -Iklibc/linux/include \ + -D__KLIBC__ LIB_OBJS =3D LDFLAGS =3D --static --nostdlib -nostartfiles else @@ -166,7 +175,7 @@ =20 =20 $(ROOT): $(GEN_HEADERS) $(OBJS) - $(CC) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) $(STRIPCMD) $(ROOT) =20 clean: diff -Nru a/tdb/tdb.h b/tdb/tdb.h --- a/tdb/tdb.h Mon Nov 24 12:03:31 2003 +++ b/tdb/tdb.h Mon Nov 24 12:03:31 2003 @@ -25,6 +25,7 @@ extern "C" { #endif =20 +#include =20 /* flags to tdb_store() */ #define TDB_REPLACE 1 --=-37KsDkBNq3CnIbsDY547 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (GNU/Linux) iD8DBQA/wjtU0ZUZrUx/K+4RAnqbAJ9IauEr/zxINeBrAd4F7m6WKtkZegCeJ1OF gz4WY3m8ZiPNDrH3KDHdnUw= =AHmd -----END PGP SIGNATURE----- --=-37KsDkBNq3CnIbsDY547-- ------------------------------------------------------- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ _______________________________________________ Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net Linux-hotplug-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel