Date: Mon, 16 Nov 2009 19:26:25 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r166 - branches/experimental/www/libxul-devel/files Message-ID: <200911161926.nAGJQPMX051892@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Mon Nov 16 19:26:25 2009
New Revision: 166
Log:
- Add patches from www/firefox3-devel for amd64, sparc64, powerpc and ia64
support (not tested yet).
Added:
branches/experimental/www/libxul-devel/files/patch-configure.in
- copied, changed from r165, branches/experimental/www/libxul-devel/files/patch-configure
branches/experimental/www/libxul-devel/files/patch-content-xslt-public-txDouble.h
- copied unchanged from r165, branches/experimental/www/firefox3-devel/files/patch-content-xslt-public-txDouble.h
branches/experimental/www/libxul-devel/files/patch-js-src-jslock.cpp
- copied unchanged from r165, branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp
Deleted:
branches/experimental/www/libxul-devel/files/patch-configure
branches/experimental/www/libxul-devel/files/patch-content_xslt_public_txDouble.h
Modified:
branches/experimental/www/libxul-devel/files/patch-security_coreconf_FreeBSD.mk
branches/experimental/www/libxul-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
Deleted: branches/experimental/www/libxul-devel/files/patch-configure
==============================================================================
--- branches/experimental/www/libxul-devel/files/patch-configure Mon Nov 16 19:26:25 2009 (r165)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- configure.orig 2008-05-28 11:31:02.000000000 -0700
-+++ configure 2008-07-26 07:27:03.712894513 -0700
-@@ -10808,7 +10808,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-liconv $LIBS"
-+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10814 "configure"
- #include "confdefs.h"
-@@ -10839,7 +10839,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10849,7 +10849,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-liconv $LIBS"
-+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10855 "configure"
- #include "confdefs.h"
-@@ -10880,7 +10880,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
- echo "$ac_t""no" 1>&6
- fi
Copied and modified: branches/experimental/www/libxul-devel/files/patch-configure.in (from r165, branches/experimental/www/libxul-devel/files/patch-configure)
==============================================================================
--- branches/experimental/www/libxul-devel/files/patch-configure Mon Nov 16 17:01:39 2009 (r165, copy source)
+++ branches/experimental/www/libxul-devel/files/patch-configure.in Mon Nov 16 19:26:25 2009 (r166)
@@ -1,38 +1,22 @@
---- configure.orig 2008-05-28 11:31:02.000000000 -0700
-+++ configure 2008-07-26 07:27:03.712894513 -0700
-@@ -10808,7 +10808,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-liconv $LIBS"
-+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10814 "configure"
- #include "confdefs.h"
-@@ -10839,7 +10839,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10849,7 +10849,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-liconv $LIBS"
-+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10855 "configure"
- #include "confdefs.h"
-@@ -10880,7 +10880,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
- echo "$ac_t""no" 1>&6
- fi
+--- configure.in.orig 2009-10-29 23:11:31.000000000 +0100
++++ configure.in 2009-11-16 19:51:19.000000000 +0100
+@@ -1352,7 +1352,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+
+@@ -3582,8 +3582,8 @@
+ *)
+
+ AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"],
+- AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"],
+- AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"])))
++ AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"],
++ AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"])))
+ _SAVE_LIBS=$LIBS
+ LIBS="$LIBS $_ICONV_LIBS"
+ AC_CACHE_CHECK(
Copied: branches/experimental/www/libxul-devel/files/patch-content-xslt-public-txDouble.h (from r165, branches/experimental/www/firefox3-devel/files/patch-content-xslt-public-txDouble.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul-devel/files/patch-content-xslt-public-txDouble.h Mon Nov 16 19:26:25 2009 (r166, copy of r165, branches/experimental/www/firefox3-devel/files/patch-content-xslt-public-txDouble.h)
@@ -0,0 +1,11 @@
+--- content/xslt/public/txDouble.h.orig 2009-08-16 21:46:27.000000000 +0200
++++ content/xslt/public/txDouble.h 2009-08-16 21:49:53.000000000 +0200
+@@ -43,7 +43,7 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#ifdef __alpha__
++#if !defined(__amd64__) && !defined(__i386__)
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+ #else
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Deleted: branches/experimental/www/libxul-devel/files/patch-content_xslt_public_txDouble.h
==============================================================================
--- branches/experimental/www/libxul-devel/files/patch-content_xslt_public_txDouble.h Mon Nov 16 19:26:25 2009 (r165)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006
-+++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
-
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
- * Macros to workaround math-bugs bugs in various platforms
- */
Copied: branches/experimental/www/libxul-devel/files/patch-js-src-jslock.cpp (from r165, branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul-devel/files/patch-js-src-jslock.cpp Mon Nov 16 19:26:25 2009 (r166, copy of r165, branches/experimental/www/firefox3-devel/files/patch-js-src-jslock.cpp)
@@ -0,0 +1,18 @@
+--- js/src/jslock.cpp.orig 2009-10-07 20:15:38.000000000 +0200
++++ js/src/jslock.cpp 2009-10-07 21:36:14.000000000 +0200
+@@ -160,8 +160,13 @@
+ unsigned int res;
+
+ __asm__ __volatile__ (
+- "stbar\n"
+- "cas [%1],%2,%3\n"
++ "membar #StoreLoad | #LoadLoad\n"
++# if defined (__sparc64__)
++ "casx [%1],%2,%3\n"
++# else
++ "cas [%1],%2,%3\n" /* 32-bit version */
++# endif
++ "membar #StoreLoad | #LoadLoad\n"
+ "cmp %2,%3\n"
+ "be,a 1f\n"
+ "mov 1,%0\n"
Modified: branches/experimental/www/libxul-devel/files/patch-security_coreconf_FreeBSD.mk
==============================================================================
--- branches/experimental/www/libxul-devel/files/patch-security_coreconf_FreeBSD.mk Mon Nov 16 17:01:39 2009 (r165)
+++ branches/experimental/www/libxul-devel/files/patch-security_coreconf_FreeBSD.mk Mon Nov 16 19:26:25 2009 (r166)
@@ -1,20 +1,14 @@
---- security/coreconf/FreeBSD.mk.orig 2009-08-24 17:52:57.000000000 +0200
-+++ security/coreconf/FreeBSD.mk 2009-10-01 07:13:15.000000000 +0200
-@@ -37,16 +37,26 @@
-
- include $(CORE_DEPTH)/coreconf/UNIX.mk
-
--DEFAULT_COMPILER = gcc
--CC = gcc
--CCC = g++
-+CCC = ${CXX}
- RANLIB = ranlib
-
+--- security/coreconf/FreeBSD.mk.orig 2009-11-09 01:34:19.000000000 +0100
++++ security/coreconf/FreeBSD.mk 2009-11-11 18:15:55.000000000 +0100
+@@ -45,8 +45,24 @@
ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha
else
+ifeq ($(OS_TEST),amd64)
+CPU_ARCH = amd64
++else
++ifeq ($(OS_TEST),ia64)
++CPU_ARCH = ia64
+else
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
@@ -27,25 +21,22 @@
+endif
+endif
+endif
++endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -73,7 +83,11 @@
+@@ -73,7 +89,7 @@
DLL_SUFFIX = so.1.0
endif
-MKSHLIB = $(CC) $(DSO_LDOPTS)
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
-+else
-+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
-+endif
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -82,4 +96,4 @@
+@@ -82,4 +98,4 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+INCLUDES += -I/usr/local/include
++#INCLUDES += -I/usr/local/include
Modified: branches/experimental/www/libxul-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/libxul-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Mon Nov 16 17:01:39 2009 (r165)
+++ branches/experimental/www/libxul-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Mon Nov 16 19:26:25 2009 (r166)
@@ -1,16 +1,16 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-08-24 17:53:28.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-10-02 22:34:36.000000000 +0200
-@@ -70,6 +70,9 @@
- ifeq (Darwin,$(OS_ARCH))
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-09-16 04:41:25.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-10-03 21:30:21.000000000 +0200
+@@ -73,6 +73,9 @@
DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED
+ CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
+ifeq (x86_64,$(OS_TEST))
+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
+endif
endif
endif
- #
-@@ -87,12 +90,20 @@
+
+@@ -96,7 +99,7 @@
endif
endif
# IA64 Linux
@@ -19,20 +19,18 @@
ifneq (,$(findstring ia64,$(OS_TEST)))
CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
- endif
- endif
-+
-+#
-+# FreeBSD/amd64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
-+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp
-+endif
-+
+@@ -111,8 +114,8 @@
+ #
+ # FreeBSD/amd64
#
- # OpenBSD/amd64
+-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
+-CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
++CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
#
-@@ -150,9 +161,15 @@
+ # BeOS/Intel (uses the same unixish_x86 code)
+@@ -165,9 +168,15 @@
ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
endif
#
@@ -49,22 +47,16 @@
CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
endif
#
-@@ -304,6 +321,14 @@
- CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS))
- endif
-
-+# FreeBSD/PPC
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDpowerpc)
-+CPPSRCS := xptcinvoke_ppc_freebsd.cpp xptcstubs_ppc_freebsd.cpp
-+ASFILES := xptcinvoke_asm_ppc_freebsd.s xptcstubs_asm_ppc_freebsd.s
-+endif
-+
-+
+@@ -322,7 +331,7 @@
#
# Linux/PPC
#
-@@ -385,6 +410,15 @@
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
+@@ -400,6 +409,15 @@
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
endif
#
@@ -72,8 +64,8 @@
+#
+ifeq ($(OS_ARCH),FreeBSD)
+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
++CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
++ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+endif
+endif
+#
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911161926.nAGJQPMX051892>