Changeset 22

Timestamp:

04/23/08 07:31:39 (2 months ago)

Author:

hanje04

Message:

#109 Fix up build for x86_64 Linux. Add in-line assembler macros to csnormal.h to replace those previously defined in asm/bitops.h

Files:

• main/src/cl/hdr/hdr/csnormal.h (modified) (4 diffs)
• main/src/tools/port/jam/Jamrules (modified) (2 diffs)
• main/src/tools/port/jam/bldenv (modified) (11 diffs)
• main/src/tools/port/shell_unix/shlibinfo.sh (modified) (2 diffs)

main/src/cl/hdr/hdr/csnormal.h

@@ -26 +26 @@
-# include <sched.h>
-# endif /* sgi_us5 Linux */
-# if defined(a64_lnx)
-# define CONFIG_SMP
-# include <asm/bitops.h>
-# endif /* a64_lnx */
-# endif /* POSIX_THREADS */
-# endif /* OS_THREADS_USED */
@@ -1841 +1837 @@
-**          Replace mg5_osx with OSX and add support for Intel OSX.
-**          Remove all OSX assembler and implement OSSpinlock calls instead
+**      20-Apr-2008 (hanje04)
+**          Add in-line assembler functions for test_and_set()/clear()
+**          functions. These replace those defined in the now missing
+**          bitops.h
-*/
-
@@ -2735 +2735 @@
-# if defined(a64_lnx)
-# define cs_aset_op
-long
+int
-# define        CS_ISSET(a)             (*(a) != (CS_ASET)0)
-# define        CS_ACLR(a)              CS_aclr(a)
-# define        CS_TAS(a)               (!CS_tas(a))
-# define        CS_SPININIT(s)          (MEfill(sizeof(*s),'\0',(char *)s))
+
+/*
+ * In-line assembler functions for atomic sychronization operations,
+ * based on those previously found in asm-x86_64/bitops.h. File
+ * has been removed from later Linux distributions but functions
+ * are still needed.
+ * Better soln would probably be to use GCC compiler macros but this 
+ * requires further investigation.
+*/
+# define ADDR (*(CS_ASET *) addr)
+static __inline__ void clear_bit(int nr, CS_ASET * addr)
+{
+        __asm__ __volatile__( "lock;"
+                "btrl %1,%0"
+                :"=m" (ADDR)
+                :"dIr" (nr));
+}
+static __inline__ int test_and_set_bit(int nr, CS_ASET * addr)
+{
+        int oldbit;
+
+        __asm__ __volatile__( "lock ;"
+                "btsl %2,%1\n\tsbbl %0,%0"
+                :"=r" (oldbit),"=m" (ADDR)
+                :"dIr" (nr) : "memory");
+        return oldbit;
+}
+
-# define CS_getspin(s)                   \
-    {                                    \
@@ -2753 +2781 @@
-{
-        __asm__ __volatile__("": : :"memory");
-(long) 
+
-        __asm__ __volatile__("": : :"memory");
-}

main/src/tools/port/jam/Jamrules

@@ -1066 +1066 @@
-#           Add missing readvers.bat dependency information to allow
-#           .pp files to be built from the local directory.
+#       23-Arp-2008 (hanje04)
+#           Add ability to reference a second location for the Xerces
+#           library on hybrid builds using XERCESLOCHB
-#
-#####
@@ -6284 +6287 @@
-        if $(VERSHB)
-        {       
-
+
+
+
+
+
+
+
+
+
+
+
-                _LINK $(SUFHB)/$(<) : $(INGLIB)/$(SUFHB)/$(XERCESCLIB) ;
-                _LINK $(SUFHB)/$(<:S=.$(SLSFX).$(XERCVERS)) : $(INGLIB)/$(SUFHB)/$(XERCESCLIB) ;
-
-SUFHB)/$(XERCESC
+XERCESCHB
-                DEPENDS $(SUFHB)/$(<) : $(SUFHB)/$(<:S=.$(SLSFX).$(XERCVERS)) ;
-                DEPENDS shlibs : $(SUFHB)/$(<) ;
-                LOCATE on $(SUFHB)/$(<) = $(INGLIB) ;
-                LOCATE on $(SUFHB)/$(<:S=.$(SLSFX).$(XERCVERS)) = $(INGLIB) ;
-SUFHB)/$(XERCESCLIB) = $(XERCES
+XERCESCHBLIB) = $(XERCESHB
-
-                MODE on $(INGLIB)/$(SUFHB)/$(XERCESCLIB) = $(EXEMODE) ; 

main/src/tools/port/jam/bldenv

@@ -123 +123 @@
-##        kerberos in system locations and if they're not found suggest
-##        how they good be if package management is available.
-
+
+
-##
-
@@ -135 +136 @@
-deb=false
-conary=false
+yum=false
+rhybrid=false
-unames=`uname -s`
-unamer=`uname -r`
@@ -206 +209 @@
-                xcc_need=i686-unknown-linux-gnu
-                xcc_name=${xcc_need}-gcc
+                rhybrid=true
-                ;;
-        x86_64)
-                config_string=a64_lnx
+                rhybrid=true
-                ;;
-        ppc64)
@@ -234 +239 @@
-            gtk_need=false
-            deb=true
+        elif [ -x /usr/bin/yum ] ; then
+            export OSVER=FEDORA
+            yum=true
-        fi
-
-        # Default to rpm if it's there
-
+
+
-            rpm=true
-        fi
@@ -345 +354 @@
-    elif $deb ; then
-        instcmd="apt-get install libkrb5-dev"
+    elif $yum ; then
+        instcmd="yum install krb5-devel"
-    else
-        instcmd=''
@@ -385 +396 @@
-    XERCESCROOT=/usr
-fi
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-[ "$XERCESCROOT" ] && [ -d ${XERCESCROOT}/src/xercesc -o \
@@ -394 +415 @@
-        export XERCESCROOT=${ING_ROOT}/xerces-c-src_2_7_0
-    else
-LOC
+ESLOC XERCESLOC64
-        cat << EOF
-
@@ -404 +425 @@
-    elif $deb ; then
-        instcmd="apt-get install libxerces27 libxerces27-dev"
+    elif $yum ; then
+        instcmd="yum install xerces-c xerces-c-devel"
-    else
-        instcmd=""
@@ -438 +461 @@
-}
-
-
+[ x"$XERCESLOC" = "x" ] && 
-        XERCESLOC=${XERCESCROOT}/lib
-while [ -z "$XERCESLOC" ] ; do
@@ -455 +478 @@
-    break
-done
-
+ XERCESLOCHB
-
-# pax for Linux
@@ -476 +499 @@
-        elif $deb ; then
-            instcmd="apt-get install pax"
+        elif $yum ; then
+            instcmd="yum install pax"
-        else
-            instcmd=""

main/src/tools/port/shell_unix/shlibinfo.sh

@@ -330 +330 @@
-#           SIR 119978
-#           Fix up shlink_opts for older OS X releases
+#       21-Apr-2008 (hanje04)
+#           Remove libgcc_s fromm 32bit link line for x86_64 Linux.
+#           It's not needed and causes problems because of a linker bug
-#
-
@@ -625 +628 @@
-        shlinkHB_cmd="ld -melf_i386 -shared "
-        shlink_opts=" -lm -lc -lpthread -ldl -lcrypt "
- -lgcc_s
+
-        krblink_cmd="ld -shared"
-        krblinkHB_cmd="ld -melf_i386 -shared"