Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:Factory checked in at Fri Apr 29 09:06:37 CEST 2011. -------- --- GNOME/mozilla-nspr/mozilla-nspr.changes 2011-01-09 23:57:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-nspr/mozilla-nspr.changes 2011-04-28 08:02:18.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 28 05:45:30 UTC 2011 - wr@rosenauer.org + +- update to 4.8.8beta3 + * support IPv6 on Android (bmo#626866) + * use AI_ADDRCONFIG for loopback hostnames (bmo#614526) + * support SDP sockets (bmo#518078) + * support m32r architecture (bmo#635667) + * use atomic functions on ARM (bmo#626309) + * some other fixes not affecting the Linux platform + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nspr-4.8.7.tar.bz2 New: ---- nspr-4.8.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.g4g2Ga/_old 2011-04-29 09:06:07.000000000 +0200 +++ /var/tmp/diff_new_pack.g4g2Ga/_new 2011-04-29 09:06:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-nspr (Version 4.8.7) +# spec file for package mozilla-nspr # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2011 Wolfgang Rosenauer @@ -21,9 +21,9 @@ Name: mozilla-nspr BuildRequires: gcc-c++ pkg-config -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 4.8.7 -Release: 2 +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ +Version: 4.8.8 +Release: 1 Summary: Netscape Portable Runtime Url: http://www.mozilla.org/projects/nspr/ # bug437293 @@ -45,7 +45,7 @@ %package devel -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ Summary: Netscape Portable Runtime development files Group: Development/Libraries/Other Requires: mozilla-nspr = %{version} ++++++ nspr-4.8.7.tar.bz2 -> nspr-4.8.8.tar.bz2 ++++++ ++++ 1707 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/admin/repackage.sh new/nspr-4.8.8/mozilla/nsprpub/admin/repackage.sh --- old/nspr-4.8.7/mozilla/nsprpub/admin/repackage.sh 2010-12-09 15:34:05.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/admin/repackage.sh 2011-04-28 07:42:59.000000000 +0200 @@ -64,10 +64,10 @@ # # ------------------------------------------------------------------ -FROMTOP=/share/builds/components/nspr20/v4.8.7 -TOTOP=./v4.8.7 -NSPRDIR=nspr-4.8.7 -SOURCETAG=NSPR_4_8_7_RTM +FROMTOP=/share/builds/components/nspr20/v4.8.8 +TOTOP=./v4.8.8 +NSPRDIR=nspr-4.8.8 +SOURCETAG=NSPR_4_8_8_RTM # # enumerate Unix object directories on /s/b/c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/configure.in new/nspr-4.8.8/mozilla/nsprpub/configure.in --- old/nspr-4.8.7/mozilla/nsprpub/configure.in 2010-12-09 15:34:05.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/configure.in 2011-04-28 07:42:59.000000000 +0200 @@ -50,7 +50,7 @@ dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=8 -MOD_PATCH_VERSION=7 +MOD_PATCH_VERSION=8 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -916,7 +916,7 @@ dnl = Enable building the Thumb2 instruction set dnl ======================================================== AC_ARG_ENABLE(thumb2, - [ --enable-thumb2 Enable Thumb2 instruction set], + [ --enable-thumb2 Enable Thumb-2 instruction set], [ if test "$enableval" = "yes"; then MOZ_THUMB2=1, fi ]) @@ -925,8 +925,8 @@ case "$target_cpu" in arm*) if test "$GNU_CC"; then - CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" + CFLAGS="$CFLAGS -march=armv7-a -mthumb" + CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb" ASFLAGS="$ASFLAGS -march=armv7-a -mthumb" else AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) @@ -937,11 +937,11 @@ ;; esac else - case "$target_cpu" in - arm*) + case "$target" in + arm-android-eabi) if test "$GNU_CC"; then - CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" - CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" + CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork" + CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork" ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork" fi ;; @@ -1144,10 +1144,12 @@ CC="$CC -arch x86_64" else CPU_ARCH=i386 + CC="$CC -arch i386" fi ;; *) CPU_ARCH=ppc + CC="$CC -arch ppc" ;; esac DSO_CFLAGS=-fPIC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/lib/ds/plarena.c new/nspr-4.8.8/mozilla/nsprpub/lib/ds/plarena.c --- old/nspr-4.8.7/mozilla/nsprpub/lib/ds/plarena.c 2010-07-23 21:01:00.000000000 +0200 +++ new/nspr-4.8.8/mozilla/nsprpub/lib/ds/plarena.c 2011-04-28 07:42:59.000000000 +0200 @@ -314,8 +314,8 @@ { PLArena *a; - for (a = pool->first.next; a; a = a->next) { - if (PR_UPTRDIFF(mark, a->base) < PR_UPTRDIFF(a->avail, a->base)) { + for (a = &pool->first; a; a = a->next) { + if (PR_UPTRDIFF(mark, a->base) <= PR_UPTRDIFF(a->avail, a->base)) { a->avail = (PRUword)PL_ARENA_ALIGN(pool, mark); FreeArenaList(pool, a, PR_FALSE); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_hpux.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_hpux.h --- old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_hpux.h 2008-01-21 10:52:48.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_hpux.h 2011-04-28 07:42:59.000000000 +0200 @@ -110,6 +110,30 @@ #define _PR_HAVE_INET_NTOP #else #define _PR_INET6_PROBE + +/* for HP-UX 11.11 without IPv6 */ +#ifndef AF_INET6 +#define AF_INET6 22 +#define AI_CANONNAME 2 +#define AI_NUMERICHOST 4 +#define AI_NUMERICSERV 8 +#define AI_V4MAPPED 0x00000010 +#define AI_ADDRCONFIG 0x00000040 +#define AI_ALL 0x00000020 +#define AI_DEFAULT (AI_V4MAPPED|AI_ADDRCONFIG) +#define NI_NUMERICHOST 2 +struct addrinfo { + int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ + int ai_family; /* PF_xxx */ + int ai_socktype; /* SOCK_xxx */ + int ai_protocol; /* IPPROTO_xxx for IPv4 and IPv6 */ + socklen_t ai_addrlen; /* length of ai_addr */ + char *ai_canonname; /* canonical name for host */ + struct sockaddr *ai_addr; /* binary address */ + struct addrinfo *ai_next; /* next structure in linked list */ +}; +#endif /* for HP-UX 11.11 without IPv6 */ + #define _PR_HAVE_MD_SOCKADDR_IN6 /* isomorphic to struct in6_addr on HP-UX B.11.23 */ struct _md_in6_addr { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_linux.cfg new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_linux.cfg --- old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_linux.cfg 2010-03-05 07:26:27.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_linux.cfg 2011-04-28 07:42:59.000000000 +0200 @@ -797,6 +797,51 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 +#elif defined(__m32r__) + +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 + +#define PR_BYTES_PER_BYTE 1 +#define PR_BYTES_PER_SHORT 2 +#define PR_BYTES_PER_INT 4 +#define PR_BYTES_PER_INT64 8 +#define PR_BYTES_PER_LONG 4 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 4 +#define PR_BYTES_PER_DWORD 8 + +#define PR_BITS_PER_BYTE 8 +#define PR_BITS_PER_SHORT 16 +#define PR_BITS_PER_INT 32 +#define PR_BITS_PER_INT64 64 +#define PR_BITS_PER_LONG 32 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 32 + +#define PR_BITS_PER_BYTE_LOG2 3 +#define PR_BITS_PER_SHORT_LOG2 4 +#define PR_BITS_PER_INT_LOG2 5 +#define PR_BITS_PER_INT64_LOG2 6 +#define PR_BITS_PER_LONG_LOG2 5 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 5 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 4 +#define PR_ALIGN_OF_INT64 4 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 4 +#define PR_ALIGN_OF_POINTER 4 +#define PR_ALIGN_OF_WORD 4 + +#define PR_BYTES_PER_WORD_LOG2 2 +#define PR_BYTES_PER_DWORD_LOG2 3 + #else #error "Unknown CPU architecture" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_linux.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_linux.h --- old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_linux.h 2010-07-23 21:01:01.000000000 +0200 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_linux.h 2011-04-28 07:42:59.000000000 +0200 @@ -83,6 +83,8 @@ #define _PR_SI_ARCHITECTURE "sh" #elif defined(__avr32__) #define _PR_SI_ARCHITECTURE "avr32" +#elif defined(__m32r__) +#define _PR_SI_ARCHITECTURE "m32r" #else #error "Unknown CPU architecture" #endif @@ -216,7 +218,18 @@ }) #endif -#if defined(__arm__) && defined(_PR_ARM_KUSER) +#if defined(__arm__) +#if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) +/* Use GCC built-in functions */ +#define _PR_HAVE_ATOMIC_OPS +#define _MD_INIT_ATOMIC() + +#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) +#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) +#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) +#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) + +#elif defined(_PR_ARM_KUSER) #define _PR_HAVE_ATOMIC_OPS #define _MD_INIT_ATOMIC() @@ -259,21 +272,24 @@ return ov; } #endif +#endif /* __arm__ */ #define USE_SETJMP -#if defined(__GLIBC__) && __GLIBC__ >= 2 +#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID) #define _PR_POLL_AVAILABLE #endif #undef _PR_USE_POLL #define _PR_STAT_HAS_ONLY_ST_ATIME #if defined(__alpha) || defined(__ia64__) #define _PR_HAVE_LARGE_OFF_T -#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) +#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ + || defined(ANDROID) #define _PR_HAVE_OFF64_T #else #define _PR_NO_LARGE_FILES #endif -#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) +#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ + || defined(ANDROID) #define _PR_INET6 #define _PR_HAVE_INET_NTOP #define _PR_HAVE_GETHOSTBYNAME2 @@ -284,6 +300,7 @@ #define _PR_HAVE_SYSV_SEMAPHORES #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY #endif +/* Android has gethostbyname_r but not gethostbyaddr_r or gethostbyname2_r. */ #if (__GLIBC__ >= 2) && defined(_PR_PTHREADS) #define _PR_HAVE_GETHOST_R #define _PR_HAVE_GETHOST_R_INT @@ -457,6 +474,18 @@ #error "SH/Linux pre-glibc2 not supported yet" #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ +#elif defined(__m32r__) +/* Linux/M32R */ +#if defined(__GLIBC__) && __GLIBC__ >= 2 +#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__regs[JB_SP] +#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[0].__regs[JB_FP] = (val)) +#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) +#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[0].__regs[JB_FP]) +#define _MD_SP_TYPE __ptr_t +#else +#error "Linux/M32R pre-glibc2 not supported yet" +#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + #else #error "Unknown CPU architecture" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/pratom.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/pratom.h --- old/nspr-4.8.7/mozilla/nsprpub/pr/include/pratom.h 2010-12-10 00:03:00.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/pratom.h 2011-04-28 07:42:59.000000000 +0200 @@ -140,6 +140,8 @@ defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \ defined(__ia64__) || defined(__x86_64__) || \ (defined(__powerpc__) && !defined(__powerpc64__)) || \ + (defined(__arm__) && \ + defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \ defined(__alpha)))) /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/prinit.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/prinit.h --- old/nspr-4.8.7/mozilla/nsprpub/pr/include/prinit.h 2011-01-09 23:24:20.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/prinit.h 2011-04-28 07:42:59.000000000 +0200 @@ -63,11 +63,11 @@ ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.8.7" +#define PR_VERSION "4.8.8 Beta" #define PR_VMAJOR 4 #define PR_VMINOR 8 -#define PR_VPATCH 7 -#define PR_BETA PR_FALSE +#define PR_VPATCH 8 +#define PR_BETA PR_TRUE /* ** PRVersionCheck diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/prio.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/prio.h --- old/nspr-4.8.7/mozilla/nsprpub/pr/include/prio.h 2009-05-20 21:54:24.000000000 +0200 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/prio.h 2011-04-28 07:42:59.000000000 +0200 @@ -142,6 +142,9 @@ #define PR_AF_INET6 100 #endif +#define PR_AF_INET_SDP 101 +#define PR_AF_INET6_SDP 102 + #ifndef PR_AF_UNSPEC #define PR_AF_UNSPEC 0 #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/prtypes.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/prtypes.h --- old/nspr-4.8.7/mozilla/nsprpub/pr/include/prtypes.h 2010-07-23 21:01:01.000000000 +0200 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/prtypes.h 2011-04-28 07:42:59.000000000 +0200 @@ -235,7 +235,7 @@ ** PRInt8 ** DESCRIPTION: ** The int8 types are known to be 8 bits each. There is no type that -** is equivalent to a plain "char". +** is equivalent to a plain "char". ************************************************************************/ #if PR_BYTES_PER_BYTE == 1 typedef unsigned char PRUint8; @@ -274,7 +274,7 @@ ** TYPES: PRUint16 ** PRInt16 ** DESCRIPTION: -** The int16 types are known to be 16 bits each. +** The int16 types are known to be 16 bits each. ************************************************************************/ #if PR_BYTES_PER_SHORT == 2 typedef unsigned short PRUint16; @@ -299,7 +299,7 @@ ** TYPES: PRUint32 ** PRInt32 ** DESCRIPTION: -** The int32 types are known to be 32 bits each. +** The int32 types are known to be 32 bits each. ************************************************************************/ #if PR_BYTES_PER_INT == 4 typedef unsigned int PRUint32; @@ -372,7 +372,7 @@ ** The PRIntn types are most appropriate for automatic variables. They are ** guaranteed to be at least 16 bits, though various architectures may ** define them to be wider (e.g., 32 or even 64 bits). These types are -** never valid for fields of a structure. +** never valid for fields of a structure. ************************************************************************/ #if PR_BYTES_PER_INT >= 2 typedef int PRIntn; @@ -384,14 +384,14 @@ /************************************************************************ ** TYPES: PRFloat64 ** DESCRIPTION: -** NSPR's floating point type is always 64 bits. +** NSPR's floating point type is always 64 bits. ************************************************************************/ typedef double PRFloat64; /************************************************************************ ** TYPES: PRSize ** DESCRIPTION: -** A type for representing the size of objects. +** A type for representing the size of objects. ************************************************************************/ typedef size_t PRSize; @@ -399,7 +399,7 @@ /************************************************************************ ** TYPES: PROffset32, PROffset64 ** DESCRIPTION: -** A type for representing byte offsets from some location. +** A type for representing byte offsets from some location. ************************************************************************/ typedef PRInt32 PROffset32; typedef PRInt64 PROffset64; @@ -408,7 +408,7 @@ ** TYPES: PRPtrDiff ** DESCRIPTION: ** A type for pointer difference. Variables of this type are suitable -** for storing a pointer or pointer subtraction. +** for storing a pointer or pointer subtraction. ************************************************************************/ typedef ptrdiff_t PRPtrdiff; @@ -416,7 +416,7 @@ ** TYPES: PRUptrdiff ** DESCRIPTION: ** A type for pointer difference. Variables of this type are suitable -** for storing a pointer or pointer sutraction. +** for storing a pointer or pointer sutraction. ************************************************************************/ #ifdef _WIN64 typedef PRUint64 PRUptrdiff; @@ -430,7 +430,7 @@ ** Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE ** for clarity of target type in assignments and actual arguments. Use ** 'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans -** just as you would C int-valued conditions. +** just as you would C int-valued conditions. ************************************************************************/ typedef PRIntn PRBool; #define PR_TRUE 1 @@ -445,7 +445,7 @@ typedef PRUint8 PRPackedBool; /* -** Status code used by some routines that have a single point of failure or +** Status code used by some routines that have a single point of failure or ** special status return. */ typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/linking/prlink.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/linking/prlink.c --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/linking/prlink.c 2010-12-09 15:34:05.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/linking/prlink.c 2011-04-28 07:42:59.000000000 +0200 @@ -1360,7 +1360,8 @@ PR_IMPLEMENT(char *) PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr) { -#if defined(USE_DLFCN) && !defined(ANDROID) && (defined(SOLARIS) || defined(FREEBSD) \ +#if defined(USE_DLFCN) && !defined(ANDROID) \ + && (defined(SOLARIS) || defined(FREEBSD) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(DARWIN)) Dl_info dli; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2008-01-21 10:52:48.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2011-04-28 07:43:00.000000000 +0200 @@ -1,46 +1,46 @@ -/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -/ -/ ***** BEGIN LICENSE BLOCK ***** -/ Version: MPL 1.1/GPL 2.0/LGPL 2.1 -/ -/ The contents of this file are subject to the Mozilla Public License Version -/ 1.1 (the "License"); you may not use this file except in compliance with -/ the License. You may obtain a copy of the License at -/ http://www.mozilla.org/MPL/ -/ -/ Software distributed under the License is distributed on an "AS IS" basis, -/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -/ for the specific language governing rights and limitations under the -/ License. -/ -/ The Original Code is the Netscape Portable Runtime (NSPR). -/ -/ The Initial Developer of the Original Code is -/ Netscape Communications Corporation. -/ Portions created by the Initial Developer are Copyright (C) 2000 -/ the Initial Developer. All Rights Reserved. -/ -/ Contributor(s): -/ -/ Alternatively, the contents of this file may be used under the terms of -/ either the GNU General Public License Version 2 or later (the "GPL"), or -/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -/ in which case the provisions of the GPL or the LGPL are applicable instead -/ of those above. If you wish to allow use of your version of this file only -/ under the terms of either the GPL or the LGPL, and not to allow others to -/ use your version of this file under the terms of the MPL, indicate your -/ decision by deleting the provisions above and replace them with the notice -/ and other provisions required by the GPL or the LGPL. If you do not delete -/ the provisions above, a recipient may use your version of this file under -/ the terms of any one of the MPL, the GPL or the LGPL. -/ -/ ***** END LICENSE BLOCK ***** +// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- +// +// ***** BEGIN LICENSE BLOCK ***** +// Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// +// The contents of this file are subject to the Mozilla Public License Version +// 1.1 (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// http://www.mozilla.org/MPL/ +// +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the +// License. +// +// The Original Code is the Netscape Portable Runtime (NSPR). +// +// The Initial Developer of the Original Code is +// Netscape Communications Corporation. +// Portions created by the Initial Developer are Copyright (C) 2000 +// the Initial Developer. All Rights Reserved. +// +// Contributor(s): +// +// Alternatively, the contents of this file may be used under the terms of +// either the GNU General Public License Version 2 or later (the "GPL"), or +// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +// in which case the provisions of the GPL or the LGPL are applicable instead +// of those above. If you wish to allow use of your version of this file only +// under the terms of either the GPL or the LGPL, and not to allow others to +// use your version of this file under the terms of the MPL, indicate your +// decision by deleting the provisions above and replace them with the notice +// and other provisions required by the GPL or the LGPL. If you do not delete +// the provisions above, a recipient may use your version of this file under +// the terms of any one of the MPL, the GPL or the LGPL. +// +// ***** END LICENSE BLOCK ***** -/ PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val) -/ -/ Atomically increment the integer pointed to by 'val' and return -/ the result of the increment. -/ +// PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val) +// +// Atomically increment the integer pointed to by 'val' and return +// the result of the increment. +// .text .globl _PR_x86_AtomicIncrement .align 4 @@ -52,11 +52,11 @@ incl %eax ret -/ PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val) -/ -/ Atomically decrement the integer pointed to by 'val' and return -/ the result of the decrement. -/ +// PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val) +// +// Atomically decrement the integer pointed to by 'val' and return +// the result of the decrement. +// .text .globl _PR_x86_AtomicDecrement .align 4 @@ -68,25 +68,25 @@ decl %eax ret -/ PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval) -/ -/ Atomically set the integer pointed to by 'val' to the new -/ value 'newval' and return the old value. -/ -/ An alternative implementation: -/ .text -/ .globl _PR_x86_AtomicSet -/ .align 4 -/_PR_x86_AtomicSet: -/ movl 4(%esp), %ecx -/ movl 8(%esp), %edx -/ movl (%ecx), %eax -/retry: -/ lock -/ cmpxchgl %edx, (%ecx) -/ jne retry -/ ret -/ +// PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval) +// +// Atomically set the integer pointed to by 'val' to the new +// value 'newval' and return the old value. +// +// An alternative implementation: +// .text +// .globl _PR_x86_AtomicSet +// .align 4 +//_PR_x86_AtomicSet: +// movl 4(%esp), %ecx +// movl 8(%esp), %edx +// movl (%ecx), %eax +//retry: +// lock +// cmpxchgl %edx, (%ecx) +// jne retry +// ret +// .text .globl _PR_x86_AtomicSet .align 4 @@ -96,11 +96,11 @@ xchgl %eax, (%ecx) ret -/ PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val) -/ -/ Atomically add 'val' to the integer pointed to by 'ptr' -/ and return the result of the addition. -/ +// PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val) +// +// Atomically add 'val' to the integer pointed to by 'ptr' +// and return the result of the addition. +// .text .globl _PR_x86_AtomicAdd .align 4 @@ -113,5 +113,5 @@ addl %edx, %eax ret -/ Magic indicating no need for an executable stack +// Magic indicating no need for an executable stack .section .note.GNU-stack, "", @progbits ; .previous diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2010-07-23 21:01:01.000000000 +0200 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2011-04-28 07:43:00.000000000 +0200 @@ -1,46 +1,46 @@ -/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -/ -/ ***** BEGIN LICENSE BLOCK ***** -/ Version: MPL 1.1/GPL 2.0/LGPL 2.1 -/ -/ The contents of this file are subject to the Mozilla Public License Version -/ 1.1 (the "License"); you may not use this file except in compliance with -/ the License. You may obtain a copy of the License at -/ http://www.mozilla.org/MPL/ -/ -/ Software distributed under the License is distributed on an "AS IS" basis, -/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -/ for the specific language governing rights and limitations under the -/ License. -/ -/ The Original Code is the Netscape Portable Runtime (NSPR). -/ -/ The Initial Developer of the Original Code is -/ Netscape Communications Corporation. -/ Portions created by the Initial Developer are Copyright (C) 2004 -/ the Initial Developer. All Rights Reserved. -/ -/ Contributor(s): -/ -/ Alternatively, the contents of this file may be used under the terms of -/ either the GNU General Public License Version 2 or later (the "GPL"), or -/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -/ in which case the provisions of the GPL or the LGPL are applicable instead -/ of those above. If you wish to allow use of your version of this file only -/ under the terms of either the GPL or the LGPL, and not to allow others to -/ use your version of this file under the terms of the MPL, indicate your -/ decision by deleting the provisions above and replace them with the notice -/ and other provisions required by the GPL or the LGPL. If you do not delete -/ the provisions above, a recipient may use your version of this file under -/ the terms of any one of the MPL, the GPL or the LGPL. -/ -/ ***** END LICENSE BLOCK ***** +// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- +// +// ***** BEGIN LICENSE BLOCK ***** +// Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// +// The contents of this file are subject to the Mozilla Public License Version +// 1.1 (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// http://www.mozilla.org/MPL/ +// +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the +// License. +// +// The Original Code is the Netscape Portable Runtime (NSPR). +// +// The Initial Developer of the Original Code is +// Netscape Communications Corporation. +// Portions created by the Initial Developer are Copyright (C) 2004 +// the Initial Developer. All Rights Reserved. +// +// Contributor(s): +// +// Alternatively, the contents of this file may be used under the terms of +// either the GNU General Public License Version 2 or later (the "GPL"), or +// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +// in which case the provisions of the GPL or the LGPL are applicable instead +// of those above. If you wish to allow use of your version of this file only +// under the terms of either the GPL or the LGPL, and not to allow others to +// use your version of this file under the terms of the MPL, indicate your +// decision by deleting the provisions above and replace them with the notice +// and other provisions required by the GPL or the LGPL. If you do not delete +// the provisions above, a recipient may use your version of this file under +// the terms of any one of the MPL, the GPL or the LGPL. +// +// ***** END LICENSE BLOCK ***** -/ PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val) -/ -/ Atomically increment the integer pointed to by 'val' and return -/ the result of the increment. -/ +// PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val) +// +// Atomically increment the integer pointed to by 'val' and return +// the result of the increment. +// .text .globl _PR_x86_64_AtomicIncrement .type _PR_x86_64_AtomicIncrement, @function @@ -53,11 +53,11 @@ ret .size _PR_x86_64_AtomicIncrement, .-_PR_x86_64_AtomicIncrement -/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val) -/ -/ Atomically decrement the integer pointed to by 'val' and return -/ the result of the decrement. -/ +// PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val) +// +// Atomically decrement the integer pointed to by 'val' and return +// the result of the decrement. +// .text .globl _PR_x86_64_AtomicDecrement .type _PR_x86_64_AtomicDecrement, @function @@ -70,11 +70,11 @@ ret .size _PR_x86_64_AtomicDecrement, .-_PR_x86_64_AtomicDecrement -/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval) -/ -/ Atomically set the integer pointed to by 'val' to the new -/ value 'newval' and return the old value. -/ +// PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval) +// +// Atomically set the integer pointed to by 'val' to the new +// value 'newval' and return the old value. +// .text .globl _PR_x86_64_AtomicSet .type _PR_x86_64_AtomicSet, @function @@ -85,11 +85,11 @@ ret .size _PR_x86_64_AtomicSet, .-_PR_x86_64_AtomicSet -/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val) -/ -/ Atomically add 'val' to the integer pointed to by 'ptr' -/ and return the result of the addition. -/ +// PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val) +// +// Atomically add 'val' to the integer pointed to by 'ptr' +// and return the result of the addition. +// .text .globl _PR_x86_64_AtomicAdd .type _PR_x86_64_AtomicAdd, @function @@ -102,5 +102,5 @@ ret .size _PR_x86_64_AtomicAdd, .-_PR_x86_64_AtomicAdd -/ Magic indicating no need for an executable stack +// Magic indicating no need for an executable stack .section .note.GNU-stack, "", @progbits ; .previous diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s 2008-01-21 10:52:48.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s 2011-04-28 07:43:00.000000000 +0200 @@ -1,40 +1,40 @@ -/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -/ -/ ***** BEGIN LICENSE BLOCK ***** -/ Version: MPL 1.1/GPL 2.0/LGPL 2.1 -/ -/ The contents of this file are subject to the Mozilla Public License Version -/ 1.1 (the "License"); you may not use this file except in compliance with -/ the License. You may obtain a copy of the License at -/ http://www.mozilla.org/MPL/ -/ -/ Software distributed under the License is distributed on an "AS IS" basis, -/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -/ for the specific language governing rights and limitations under the -/ License. -/ -/ The Original Code is the Netscape Portable Runtime (NSPR). -/ -/ The Initial Developer of the Original Code is -/ Netscape Communications Corporation. -/ Portions created by the Initial Developer are Copyright (C) 1998-2000 -/ the Initial Developer. All Rights Reserved. -/ -/ Contributor(s): -/ -/ Alternatively, the contents of this file may be used under the terms of -/ either the GNU General Public License Version 2 or later (the "GPL"), or -/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -/ in which case the provisions of the GPL or the LGPL are applicable instead -/ of those above. If you wish to allow use of your version of this file only -/ under the terms of either the GPL or the LGPL, and not to allow others to -/ use your version of this file under the terms of the MPL, indicate your -/ decision by deleting the provisions above and replace them with the notice -/ and other provisions required by the GPL or the LGPL. If you do not delete -/ the provisions above, a recipient may use your version of this file under -/ the terms of any one of the MPL, the GPL or the LGPL. -/ -/ ***** END LICENSE BLOCK ***** +// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- +// +// ***** BEGIN LICENSE BLOCK ***** +// Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// +// The contents of this file are subject to the Mozilla Public License Version +// 1.1 (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// http://www.mozilla.org/MPL/ +// +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the +// License. +// +// The Original Code is the Netscape Portable Runtime (NSPR). +// +// The Initial Developer of the Original Code is +// Netscape Communications Corporation. +// Portions created by the Initial Developer are Copyright (C) 1998-2000 +// the Initial Developer. All Rights Reserved. +// +// Contributor(s): +// +// Alternatively, the contents of this file may be used under the terms of +// either the GNU General Public License Version 2 or later (the "GPL"), or +// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +// in which case the provisions of the GPL or the LGPL are applicable instead +// of those above. If you wish to allow use of your version of this file only +// under the terms of either the GPL or the LGPL, and not to allow others to +// use your version of this file under the terms of the MPL, indicate your +// decision by deleting the provisions above and replace them with the notice +// and other provisions required by the GPL or the LGPL. If you do not delete +// the provisions above, a recipient may use your version of this file under +// the terms of any one of the MPL, the GPL or the LGPL. +// +// ***** END LICENSE BLOCK ***** .text @@ -60,31 +60,31 @@ ret -/ -/ sol_getsp() -/ -/ Return the current sp (for debugging) -/ +// +// sol_getsp() +// +// Return the current sp (for debugging) +// .globl sol_getsp sol_getsp: movl %esp, %eax ret -/ -/ sol_curthread() -/ -/ Return a unique identifier for the currently active thread. -/ +// +// sol_curthread() +// +// Return a unique identifier for the currently active thread. +// .globl sol_curthread sol_curthread: movl %ecx, %eax ret -/ PRInt32 _MD_AtomicIncrement(PRInt32 *val) -/ -/ Atomically increment the integer pointed to by 'val' and return -/ the result of the increment. -/ +// PRInt32 _MD_AtomicIncrement(PRInt32 *val) +// +// Atomically increment the integer pointed to by 'val' and return +// the result of the increment. +// .text .globl _MD_AtomicIncrement .align 4 @@ -96,11 +96,11 @@ incl %eax ret -/ PRInt32 _MD_AtomicDecrement(PRInt32 *val) -/ -/ Atomically decrement the integer pointed to by 'val' and return -/ the result of the decrement. -/ +// PRInt32 _MD_AtomicDecrement(PRInt32 *val) +// +// Atomically decrement the integer pointed to by 'val' and return +// the result of the decrement. +// .text .globl _MD_AtomicDecrement .align 4 @@ -112,25 +112,25 @@ decl %eax ret -/ PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval) -/ -/ Atomically set the integer pointed to by 'val' to the new -/ value 'newval' and return the old value. -/ -/ An alternative implementation: -/ .text -/ .globl _MD_AtomicSet -/ .align 4 -/_MD_AtomicSet: -/ movl 4(%esp), %ecx -/ movl 8(%esp), %edx -/ movl (%ecx), %eax -/retry: -/ lock -/ cmpxchgl %edx, (%ecx) -/ jne retry -/ ret -/ +// PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval) +// +// Atomically set the integer pointed to by 'val' to the new +// value 'newval' and return the old value. +// +// An alternative implementation: +// .text +// .globl _MD_AtomicSet +// .align 4 +//_MD_AtomicSet: +// movl 4(%esp), %ecx +// movl 8(%esp), %edx +// movl (%ecx), %eax +//retry: +// lock +// cmpxchgl %edx, (%ecx) +// jne retry +// ret +// .text .globl _MD_AtomicSet .align 4 @@ -140,11 +140,11 @@ xchgl %eax, (%ecx) ret -/ PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val) -/ -/ Atomically add 'val' to the integer pointed to by 'ptr' -/ and return the result of the addition. -/ +// PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val) +// +// Atomically add 'val' to the integer pointed to by 'ptr' +// and return the result of the addition. +// .text .globl _MD_AtomicAdd .align 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s 2008-01-21 10:52:48.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s 2011-04-28 07:43:00.000000000 +0200 @@ -1,46 +1,46 @@ -/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -/ -/ ***** BEGIN LICENSE BLOCK ***** -/ Version: MPL 1.1/GPL 2.0/LGPL 2.1 -/ -/ The contents of this file are subject to the Mozilla Public License Version -/ 1.1 (the "License"); you may not use this file except in compliance with -/ the License. You may obtain a copy of the License at -/ http://www.mozilla.org/MPL/ -/ -/ Software distributed under the License is distributed on an "AS IS" basis, -/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -/ for the specific language governing rights and limitations under the -/ License. -/ -/ The Original Code is the Netscape Portable Runtime (NSPR). -/ -/ The Initial Developer of the Original Code is -/ Netscape Communications Corporation. -/ Portions created by the Initial Developer are Copyright (C) 2004 -/ the Initial Developer. All Rights Reserved. -/ -/ Contributor(s): -/ -/ Alternatively, the contents of this file may be used under the terms of -/ either the GNU General Public License Version 2 or later (the "GPL"), or -/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -/ in which case the provisions of the GPL or the LGPL are applicable instead -/ of those above. If you wish to allow use of your version of this file only -/ under the terms of either the GPL or the LGPL, and not to allow others to -/ use your version of this file under the terms of the MPL, indicate your -/ decision by deleting the provisions above and replace them with the notice -/ and other provisions required by the GPL or the LGPL. If you do not delete -/ the provisions above, a recipient may use your version of this file under -/ the terms of any one of the MPL, the GPL or the LGPL. -/ -/ ***** END LICENSE BLOCK ***** +// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- +// +// ***** BEGIN LICENSE BLOCK ***** +// Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// +// The contents of this file are subject to the Mozilla Public License Version +// 1.1 (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// http://www.mozilla.org/MPL/ +// +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the +// License. +// +// The Original Code is the Netscape Portable Runtime (NSPR). +// +// The Initial Developer of the Original Code is +// Netscape Communications Corporation. +// Portions created by the Initial Developer are Copyright (C) 2004 +// the Initial Developer. All Rights Reserved. +// +// Contributor(s): +// +// Alternatively, the contents of this file may be used under the terms of +// either the GNU General Public License Version 2 or later (the "GPL"), or +// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +// in which case the provisions of the GPL or the LGPL are applicable instead +// of those above. If you wish to allow use of your version of this file only +// under the terms of either the GPL or the LGPL, and not to allow others to +// use your version of this file under the terms of the MPL, indicate your +// decision by deleting the provisions above and replace them with the notice +// and other provisions required by the GPL or the LGPL. If you do not delete +// the provisions above, a recipient may use your version of this file under +// the terms of any one of the MPL, the GPL or the LGPL. +// +// ***** END LICENSE BLOCK ***** -/ PRInt32 _MD_AtomicIncrement(PRInt32 *val) -/ -/ Atomically increment the integer pointed to by 'val' and return -/ the result of the increment. -/ +// PRInt32 _MD_AtomicIncrement(PRInt32 *val) +// +// Atomically increment the integer pointed to by 'val' and return +// the result of the increment. +// .text .globl _MD_AtomicIncrement .align 4 @@ -51,11 +51,11 @@ incl %eax ret -/ PRInt32 _MD_AtomicDecrement(PRInt32 *val) -/ -/ Atomically decrement the integer pointed to by 'val' and return -/ the result of the decrement. -/ +// PRInt32 _MD_AtomicDecrement(PRInt32 *val) +// +// Atomically decrement the integer pointed to by 'val' and return +// the result of the decrement. +// .text .globl _MD_AtomicDecrement .align 4 @@ -66,11 +66,11 @@ decl %eax ret -/ PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval) -/ -/ Atomically set the integer pointed to by 'val' to the new -/ value 'newval' and return the old value. -/ +// PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval) +// +// Atomically set the integer pointed to by 'val' to the new +// value 'newval' and return the old value. +// .text .globl _MD_AtomicSet .align 4 @@ -79,11 +79,11 @@ xchgl %eax, (%rdi) ret -/ PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val) -/ -/ Atomically add 'val' to the integer pointed to by 'ptr' -/ and return the result of the addition. -/ +// PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val) +// +// Atomically add 'val' to the integer pointed to by 'ptr' +// and return the result of the addition. +// .text .globl _MD_AtomicAdd .align 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/unix.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/unix.c --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/unix.c 2010-03-05 07:26:28.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/unix.c 2011-04-28 07:43:00.000000000 +0200 @@ -2256,6 +2256,10 @@ PR_Lock(_pr_rename_lock); } +#if defined(ANDROID) + osflags |= O_LARGEFILE; +#endif + rv = _md_iovector._open64(name, osflags, mode); if (rv < 0) { @@ -2742,6 +2746,23 @@ } /* _MD_Unix_mmap64 */ #endif /* defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5) */ +/* Android doesn't have mmap64. */ +#if defined(ANDROID) +extern void *__mmap2(void *, size_t, int, int, int, size_t); + +#define ANDROID_PAGE_SIZE 4096 + +static void * +mmap64(void *addr, size_t len, int prot, int flags, int fd, loff_t offset) +{ + if (offset & (ANDROID_PAGE_SIZE - 1)) { + errno = EINVAL; + return MAP_FAILED; + } + return __mmap2(addr, len, prot, flags, fd, offset / ANDROID_PAGE_SIZE); +} +#endif + #if defined(OSF1) && defined(__GNUC__) /* @@ -2796,7 +2817,11 @@ _md_iovector._stat64 = stat; _md_iovector._lseek64 = _MD_Unix_lseek64; #elif defined(_PR_HAVE_OFF64_T) -#if defined(IRIX5_3) +#if defined(IRIX5_3) || defined(ANDROID) + /* + * Android doesn't have open64. We pass the O_LARGEFILE flag to open + * in _MD_open. + */ _md_iovector._open64 = open; #else _md_iovector._open64 = open64; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/dtoa.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/dtoa.c --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/dtoa.c 2010-07-23 21:01:01.000000000 +0200 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/dtoa.c 2011-04-28 07:43:00.000000000 +0200 @@ -70,7 +70,8 @@ * #define IBM for IBM mainframe-style floating-point arithmetic. * #define VAX for VAX-style floating-point arithmetic (D_floating). * #define No_leftright to omit left-right logic in fast floating-point - * computation of dtoa. + * computation of dtoa. This will cause dtoa modes 4 and 5 to be + * treated the same as modes 2 and 3 for some inputs. * #define Honor_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3 * and strtod and dtoa should round accordingly. Unless Trust_FLT_ROUNDS * is also #defined, fegetround() will be queried for the rounding mode. @@ -84,7 +85,12 @@ * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines * that use extended-precision instructions to compute rounded * products and quotients) with IBM. - * #define ROUND_BIASED for IEEE-format with biased rounding. + * #define ROUND_BIASED for IEEE-format with biased rounding and arithmetic + * that rounds toward +Infinity. + * #define ROUND_BIASED_without_Round_Up for IEEE-format with biased + * rounding when the underlying floating-point arithmetic uses + * unbiased rounding. This prevent using ordinary floating-point + * arithmetic when the result could be computed with one rounding error. * #define Inaccurate_Divide for IEEE-format with correctly rounded * products but inaccurate quotients, e.g., for Intel i860. * #define NO_LONG_LONG on machines that do not have a "long long" @@ -453,6 +459,11 @@ #ifndef IEEE_Arith #define ROUND_BIASED +#else +#ifdef ROUND_BIASED_without_Round_Up +#undef ROUND_BIASED +#define ROUND_BIASED +#endif #endif #ifdef RND_PRODQUOT @@ -2576,6 +2587,8 @@ for(; c == '0'; c = *++s) nz++; if (c > '0' && c <= '9') { + bc.dp0 = s0 - s; + bc.dp1 = bc.dp0 + bc.dplen; s0 = s; nf += nz; nz = 0; @@ -2703,6 +2716,7 @@ ) { if (!e) goto ret; +#ifndef ROUND_BIASED_without_Round_Up if (e > 0) { if (e <= Ten_pmax) { #ifdef VAX @@ -2763,6 +2777,7 @@ goto ret; } #endif +#endif /* ROUND_BIASED_without_Round_Up */ } e1 += nd - k; @@ -3678,6 +3693,9 @@ U d2, eps, u; double ds; char *s, *s0; +#ifdef IEEE_Arith + U eps1; +#endif #ifdef SET_INEXACT int inexact, oldinexact; #endif @@ -3941,14 +3959,26 @@ * generating digits needed. */ dval(&eps) = 0.5/tens[ilim-1] - dval(&eps); +#ifdef IEEE_Arith + if (k0 < 0 && j1 >= 307) { + eps1.d = 1.01e256; /* 1.01 allows roundoff in the next few lines */ + word0(&eps1) -= Exp_msk1 * (Bias+P-1); + dval(&eps1) *= tens[j1 & 0xf]; + for(i = 0, j = (j1-256) >> 4; j; j >>= 1, i++) + if (j & 1) + dval(&eps1) *= bigtens[i]; + if (eps.d < eps1.d) + eps.d = eps1.d; + } +#endif for(i = 0;;) { L = dval(&u); dval(&u) -= L; *s++ = '0' + (int)L; - if (dval(&u) < dval(&eps)) - goto ret1; if (1. - dval(&u) < dval(&eps)) goto bump_up; + if (dval(&u) < dval(&eps)) + goto ret1; if (++i >= ilim) break; dval(&eps) *= 10.; @@ -4022,7 +4052,12 @@ } #endif dval(&u) += dval(&u); - if (dval(&u) > ds || (dval(&u) == ds && L & 1)) { +#ifdef ROUND_BIASED + if (dval(&u) >= ds) +#else + if (dval(&u) > ds || (dval(&u) == ds && L & 1)) +#endif + { bump_up: while(*--s == '9') if (s == s0) { @@ -4106,15 +4141,6 @@ * and for all and pass them and a shift to quorem, so it * can do shifts and ors to compute the numerator for q. */ -#ifdef Pack_32 - if ((i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f)) - i = 32 - i; -#define iInc 28 -#else - if (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf) - i = 16 - i; -#define iInc 12 -#endif i = dshift(S, s2); b2 += i; m2 += i; @@ -4207,7 +4233,11 @@ if (j1 > 0) { b = lshift(b, 1); j1 = cmp(b, S); +#ifdef ROUND_BIASED + if (j1 >= 0 /*)*/ +#else if ((j1 > 0 || (j1 == 0 && dig & 1)) +#endif && dig++ == '9') goto round_9_up; } @@ -4267,7 +4297,12 @@ #endif b = lshift(b, 1); j = cmp(b, S); - if (j > 0 || (j == 0 && dig & 1)) { +#ifdef ROUND_BIASED + if (j >= 0) +#else + if (j > 0 || (j == 0 && dig & 1)) +#endif + { roundoff: while(*--s == '9') if (s == s0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/prnetdb.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prnetdb.c --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/prnetdb.c 2010-07-23 21:01:01.000000000 +0200 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prnetdb.c 2011-04-28 07:43:00.000000000 +0200 @@ -95,8 +95,8 @@ #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \ || (defined(LINUX) && defined(_REENTRANT) \ - && !(defined(__GLIBC__) && __GLIBC__ >= 2)) \ - && !defined(ANDROID) + && !(defined(__GLIBC__) && __GLIBC__ >= 2) \ + && !defined(ANDROID)) #define _PR_HAVE_GETPROTO_R #define _PR_HAVE_GETPROTO_R_POINTER #endif @@ -2039,7 +2039,32 @@ */ memset(&hints, 0, sizeof(hints)); - hints.ai_flags = (flags & PR_AI_NOCANONNAME) ? 0: AI_CANONNAME; + if (!(flags & PR_AI_NOCANONNAME)) + hints.ai_flags |= AI_CANONNAME; +#ifdef AI_ADDRCONFIG + /* + * Propagate AI_ADDRCONFIG to the GETADDRINFO call if PR_AI_ADDRCONFIG + * is set. + * + * Need a workaround for loopback host addresses: + * The problem is that in glibc and Windows, AI_ADDRCONFIG applies the + * existence of an outgoing network interface to IP addresses of the + * loopback interface, due to a strict interpretation of the + * specification. For example, if a computer does not have any + * outgoing IPv6 network interface, but its loopback network interface + * supports IPv6, a getaddrinfo call on "localhost" with AI_ADDRCONFIG + * won't return the IPv6 loopback address "::1", because getaddrinfo + * thinks the computer cannot connect to any IPv6 destination, + * ignoring the remote vs. local/loopback distinction. + */ + if ((flags & PR_AI_ADDRCONFIG) && + strcmp(hostname, "localhost") != 0 && + strcmp(hostname, "localhost.localdomain") != 0 && + strcmp(hostname, "localhost6") != 0 && + strcmp(hostname, "localhost6.localdomain6") != 0) { + hints.ai_flags |= AI_ADDRCONFIG; + } +#endif hints.ai_family = (af == PR_AF_INET) ? AF_INET : AF_UNSPEC; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/prsystem.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prsystem.c --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/prsystem.c 2010-07-23 21:01:01.000000000 +0200 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prsystem.c 2011-04-28 07:43:00.000000000 +0200 @@ -284,7 +284,7 @@ long pageCount = sysconf(_SC_PHYS_PAGES); bytes = (PRUint64) pageSize * pageCount; -#elif defined(NETBSD) +#elif defined(NETBSD) || defined(OPENBSD) int mib[2]; int rc; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/pthreads/ptio.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/pthreads/ptio.c --- old/nspr-4.8.7/mozilla/nsprpub/pr/src/pthreads/ptio.c 2010-12-09 15:34:06.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/pthreads/ptio.c 2011-04-28 07:43:00.000000000 +0200 @@ -218,6 +218,20 @@ #error "Cannot determine architecture" #endif +#if defined(SOLARIS) +#ifndef PROTO_SDP +/* on solaris, SDP is a new type of protocol */ +#define PROTO_SDP 257 +#endif +#define _PR_HAVE_SDP +#elif defined(LINUX) +#ifndef AF_INET_SDP +/* on linux, SDP is a new type of address family */ +#define AF_INET_SDP 27 +#endif +#define _PR_HAVE_SDP +#endif /* LINUX */ + static PRFileDesc *pt_SetMethods( PRIntn osfd, PRDescType type, PRBool isAcceptedSocket, PRBool imported); @@ -3462,6 +3476,12 @@ if (PF_INET != domain && PR_AF_INET6 != domain +#if defined(_PR_HAVE_SDP) + && PR_AF_INET_SDP != domain +#if defined(SOLARIS) + && PR_AF_INET6_SDP != domain +#endif /* SOLARIS */ +#endif /* _PR_HAVE_SDP */ && PF_UNIX != domain) { PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0); @@ -3474,6 +3494,20 @@ (void)PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0); return fd; } +#if defined(_PR_HAVE_SDP) +#if defined(LINUX) + if (PR_AF_INET_SDP == domain) + domain = AF_INET_SDP; +#elif defined(SOLARIS) + if (PR_AF_INET_SDP == domain) { + domain = AF_INET; + proto = PROTO_SDP; + } else if(PR_AF_INET6_SDP == domain) { + domain = AF_INET6; + proto = PROTO_SDP; + } +#endif /* SOLARIS */ +#endif /* _PR_HAVE_SDP */ #if defined(_PR_INET6_PROBE) if (PR_AF_INET6 == domain) domain = _pr_ipv6_is_present() ? AF_INET6 : AF_INET; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/tests/vercheck.c new/nspr-4.8.8/mozilla/nsprpub/pr/tests/vercheck.c --- old/nspr-4.8.7/mozilla/nsprpub/pr/tests/vercheck.c 2010-12-09 15:34:06.000000000 +0100 +++ new/nspr-4.8.8/mozilla/nsprpub/pr/tests/vercheck.c 2011-04-28 07:43:00.000000000 +0200 @@ -52,9 +52,9 @@ #include <stdlib.h> /* - * This release (4.8.7) is backward compatible with the + * This release (4.8.8) is backward compatible with the * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x, - * 4.8, 4.8.1, 4.8.2, 4.8.3, 4.8.4, 4.8.5, and 4.8.6 releases. + * 4.8, 4.8.1, 4.8.2, 4.8.3, 4.8.4, 4.8.5, 4.8.6 and 4.8.7 releases. * It, of course, is compatible with itself. */ static char *compatible_version[] = { @@ -66,7 +66,7 @@ "4.7", "4.7.1", "4.7.2", "4.7.3", "4.7.4", "4.7.5", "4.7.6", "4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5", - "4.8.6", PR_VERSION + "4.8.6", "4.8.7", PR_VERSION }; /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org