CVS: intermezzo/presto24 Rules.linux,NONE,1.1 archdep.m4,NONE,1.1 Makefile.am,1.8,1.9 configure.in,1.17,1.18

Update of /cvsroot/intermezzo/intermezzo/presto24
In directory usw-pr-cvs1:/tmp/cvs-serv23976/fs24

Modified Files:
	Makefile.am configure.in 
Added Files:
	Rules.linux archdep.m4 
Log Message:
* add archdep.m4 from lustre project, now we can compile on alpha


--- NEW FILE ---
# included in Linux kernel directories
# Rules for module building

MODLINK=@MOD_LINK@

$(MODULE).o: $($(MODULE)_OBJECTS)
# 	$(LD) -m "`$(LD) --help | awk '/supported emulations/ {print $$4}'`" -r -o $(MODULE).o $($(MODULE)_OBJECTS)
	$(LD) -m $(MOD_LINK) -r -o $(MODULE).o $($(MODULE)_OBJECTS)

--- NEW FILE ---
AC_MSG_CHECKING(if you are running user mode linux for $host_alias..)
if test -e $LINUX/include/asm-um ; then
if test  X`ls -id $LINUX/include/asm | awk '{print $1}'` = X`ls -id $LINUX/include/asm-um | awk '{print $1}'` ; then
	host_cpu="um";
	AC_MSG_RESULT(yes)
else
	AC_MSG_RESULT(no)
fi

else 
        AC_MSG_RESULT(no)
fi

AC_MSG_CHECKING(setting make flags system architecture: )
case ${host_cpu} in
	um )
	AC_MSG_RESULT($host_cpu)
	KCFLAGS='-g -Wall -pipe -Wno-trigraphs -Wstrict-prototypes -fno-strict-aliasing -fno-common '
	KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/include '
        MOD_LINK=elf_i386
;;
	i*86 )
	AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -pipe'
        KCPPFLAGS='-D__KERNEL__ -DMODULE '
        MOD_LINK=elf_i386
;;

	alphaev6 )
	AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev6'
        KCPPFLAGS='-D__KERNEL__ -DMODULE '
        MOD_LINK=elf64alpha
;;

	alphaev67 )
	AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev6'
        KCPPFLAGS='-D__KERNEL__ -DMODULE '
        MOD_LINK=elf64alpha
;;

	alpha* )
	AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev5'
        KCPPFLAGS='-D__KERNEL__ -DMODULE '
        MOD_LINK=elf64alpha
;;

	ia64 )
	AC_MSG_RESULT($host_cpu)
        KCFLAGS='-Wall -Wstrict-prototypes -Wno-trigraphs -g -O2 -fno-strict-aliasing -fno-common -pipe -ffixed-r13 -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step'
	KCPPFLAGS='-D__KERNEL__ -DMODULE'
        MOD_LINK=elf64_ia64
;;

	sparc64 )
	AC_MSG_RESULT($host_cpu)
        KCFLAGS='-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -Wno-unused -m64 -pipe -mno-fpu -mcpu=ultrasparc -mcmodel=medlow -ffixed-g4 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare -Wa,--undeclared-regs'
        KCPPFLAGS='-D__KERNEL__'
        MOD_LINK=elf64_sparc

;;

	powerpc )
	AC_MSG_RESULT($host_cpu)
        KCFLAGS='-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -D__powerpc__ -fsigned-char -msoft-float -pipe -ffixed-r2 -Wno-uninitialized -mmultiple -mstring'
        KCPPFLAGS='-D__KERNEL__'
        MOD_LINK=elf32ppclinux
;;

        *)
	AC_ERROR("Unknown Linux Platform: $host_cpu")
;;
esac

AC_MSG_CHECKING(for MODVERSIONS)
if egrep -e 'MODVERSIONS.*1' $LINUX/include/linux/autoconf.h >/dev/null 2>&1;
then
	MFLAGS="-DMODULE -DMODVERSIONS -include $LINUX/include/linux/modversions.h -DEXPORT_SYMTAB"
	AC_MSG_RESULT(yes)
else
	MFLAGS=
	AC_MSG_RESULT(no)
fi

AC_MSG_CHECKING(for SMP)
if egrep -e SMP=y $LINUX/.config >/dev/null 2>&1; then
	SMPFLAG=
	AC_MSG_RESULT(yes)
else
	SMPFLAG=
	AC_MSG_RESULT(no)
fi

CFLAGS="$KCFLAGS $MFLAGS"
ARCHCPPFLAGS="$KCPPFLAGS"

Index: Makefile.am
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- Makefile.am	11 Feb 2002 06:22:31 -0000	1.8
+++ Makefile.am	8 Oct 2002 20:04:02 -0000	1.9
@@ -4,4 +4,8 @@
 # See the file COPYING in this distribution
 
+include ./Rules.linux
+
+EXTRA_DIST = Rules.linux archdep.m4
+
 NORECURSE = t
 export NORECURSE

Index: configure.in
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- configure.in	23 Sep 2002 22:10:06 -0000	1.17
+++ configure.in	8 Oct 2002 20:04:02 -0000	1.18
@@ -1,3 +1,4 @@
 AC_INIT
+AC_CANONICAL_SYSTEM
 # Copyright (C) 2001, 2002 Cluster File Systems, Inc.
 #
@@ -44,37 +45,12 @@
 fi
 
-AC_MSG_CHECKING(if you are compiling for user mode linux)
-um_asm_link=`ls -l "$LINUX/include/asm" | sed -e "s%.* $LINUX/include/asm -> %%"`
-if test "X$um_asm_link" = Xasm-um; then
-        AC_MSG_RESULT(yes)
-        KCFLAGS='-Wall -pipe -Wno-trigraphs -Wstrict-prototypes -fno-strict-aliasing -fno-common -g '
-        KCPPFLAGS='-D__KERNEL__ -DMODULE -I$(srcdir) -I$(LINUX)/include -I$(top_srcdir)/include  -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE -I$(LINUX)/arch/um/include -Derrno=kernel_errno'
-else
-        AC_MSG_RESULT(no)
-        KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -pipe'
-        KCPPFLAGS='-D__KERNEL__ -DMODULE -I$(srcdir) -I$(LINUX)/include -I$(top_srcdir)/include'
-fi
+sinclude(archdep.m4)
+AC_SUBST(MOD_LINK)
 
-AC_MSG_CHECKING(for MODVERSIONS)
-if egrep -e 'MODVERSIONS.*1' $LINUX/include/linux/autoconf.h >/dev/null 2>&1;
-then
-	MFLAGS="-DMODVERSIONS -include $LINUX/include/linux/modversions.h"
-	AC_MSG_RESULT(yes)
-else
-	MFLAGS=
-	AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(for SMP)
-if egrep -e SMP=y $LINUX/.config >/dev/null 2>&1; then
-	SMPFLAG=-D__SMP__
-	AC_MSG_RESULT(yes)
-else
-	SMPFLAG=
-	AC_MSG_RESULT(no)
-fi
+# CFLAGS="$KCFLAGS"
+# CPPFLAGS="$MFLAGS $SMPFLAG $KCPPFLAGS"
 
-CFLAGS="$KCFLAGS"
-CPPFLAGS="$MFLAGS $SMPFLAG $KCPPFLAGS"
+KINCFLAGS='-I.  -I$(LINUX)/include '
+CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS "
 
 AC_MSG_CHECKING(for Linux release)



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf