# note: freebsd is the same, but leave out -fno-stack-protector # build and install libs: gtk 1, IDL, jpeg, png, mng, tiff MOZ_PHOENIX=1 export MOZ_PHOENIX # see also browser/config/mozconfig ../firefox-1.0/configure \ --disable-auto-deps \ --disable-bidi \ --disable-composer \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --disable-debug \ --disable-dtd-debug \ --disable-freetypetest \ --disable-glibtest \ --disable-gtktest \ --disable-installer \ --disable-jsd \ --disable-ldap \ --disable-mailnews \ --disable-md \ --disable-oji \ --disable-pedantic \ --disable-plaintext-editor-only \ --disable-profilesharing \ --disable-shared \ --disable-svg \ --disable-tests \ --disable-xinerama \ --disable-xprint \ --disable-xterm-updates \ --enable-crypto \ --enable-default-toolkit=gtk \ --enable-double-buffer \ --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,negotiateauth \ --enable-mathml \ --enable-optimize="-Os -march=pentium -fno-stack-protector" \ --enable-single-profile \ --enable-static \ --enable-strip \ --prefix=/usr/X11R6 \ --with-pthreads \ --with-system-jpeg=/usr/local \ --with-system-mng=/usr/local \ --with-system-png=/usr/local \ --with-system-zlib=/usr/lib \ --x-includes=/usr/X11R6/include \ --x-libraries=/usr/X11R6/lib unlimit gmake MOZ_PHOENIX=1 can't get xft to work; it's installed, but configure insists on using pkg-config to find it. had to remove /usr/include/freetype, /usr/include/freetype.h (freetype 1 vs 2) Index: content/html/content/src/nsHTMLInputElement.cpp =================================================================== RCS file: /cvsroot/mozilla/content/html/content/src/nsHTMLInputElement.cpp,v retrieving revision 1.336.2.1.2.5 diff -u -r1.336.2.1.2.5 nsHTMLInputElement.cpp --- content/html/content/src/nsHTMLInputElement.cpp 22 Oct 2004 19:34:36 -0000 1.336.2.1.2.5 +++ content/html/content/src/nsHTMLInputElement.cpp 10 Mar 2005 02:04:00 -0000 @@ -1144,7 +1144,7 @@ nsHTMLInputElement::Select() { nsresult rv = NS_OK; - if (!mDocument) + if (!mDocument || !ShouldFocus(this)) return NS_OK; // first see if we are disabled or not. If disabled then do nothing. Index: extensions/transformiix/source/base/Double.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/transformiix/source/base/Double.cpp,v retrieving revision 1.22 diff -u -r1.22 Double.cpp --- extensions/transformiix/source/base/Double.cpp 15 Jan 2004 21:23:18 -0000 1.22 +++ extensions/transformiix/source/base/Double.cpp 10 Mar 2005 02:04:21 -0000 @@ -114,17 +114,19 @@ #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 #define TX_DOUBLE_HI32_MANTMASK 0x000fffff +#define STRICT_ALIGN __attribute__ ((aligned (8))) + //-- Initialize Double related constants #ifdef IS_BIG_ENDIAN -const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, +const PRUint32 nanMask[2] STRICT_ALIGN = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}; -const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; -const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; +const PRUint32 infMask[2] STRICT_ALIGN = {TX_DOUBLE_HI32_EXPMASK, 0}; +const PRUint32 negInfMask[2] STRICT_ALIGN = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; #else -const PRUint32 nanMask[2] = {0xffffffff, +const PRUint32 nanMask[2] STRICT_ALIGN = {0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; -const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; -const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; +const PRUint32 infMask[2] STRICT_ALIGN = {0, TX_DOUBLE_HI32_EXPMASK}; +const PRUint32 negInfMask[2] STRICT_ALIGN = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; #endif const double Double::NaN = *((double*)nanMask); Index: modules/plugin/base/public/nptypes.h =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/base/public/nptypes.h,v retrieving revision 3.19.4.4 diff -u -r3.19.4.4 nptypes.h --- modules/plugin/base/public/nptypes.h 1 Sep 2004 16:59:55 -0000 3.19.4.4 +++ modules/plugin/base/public/nptypes.h 10 Mar 2005 02:04:53 -0000 @@ -58,7 +58,7 @@ #ifndef __cplusplus typedef int bool; #endif -#elif defined(bsdi) || defined(FREEBSD) || defined(OPENBSD) +#elif defined(bsdi) || defined(FREEBSD) /* * BSD/OS, FreeBSD, and OpenBSD ship sys/types.h that define int32_t and * u_int32_t. @@ -87,6 +87,13 @@ #include #include #endif +#elif defined(OPENBSD) + #include + + typedef u_int32_t uint32_t; + #if !defined(__cplusplus) + typedef int bool; + #endif #elif defined(BEOS) #include #else Index: netwerk/streamconv/converters/nsHTTPCompressConv.cpp =================================================================== RCS file: /cvsroot/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp,v retrieving revision 1.20 retrieving revision 1.22 diff -u -r1.20 -r1.22 --- netwerk/streamconv/converters/nsHTTPCompressConv.cpp 28 May 2003 23:45:06 -0000 1.20 +++ netwerk/streamconv/converters/nsHTTPCompressConv.cpp 16 Jun 2004 16:28:30 -0000 1.22 @@ -1,11 +1,12 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:set ts=4 sw=4 sts=4 cindent et: */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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 @@ -14,25 +15,25 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * David Dick + * David Dick * * 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 + * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ @@ -46,6 +47,18 @@ #include "nsIByteArrayInputStream.h" #include "nsIStringStream.h" +static NS_METHOD +DiscardSegments(nsIInputStream *input, + void *closure, + const char *buf, + PRUint32 offset, + PRUint32 count, + PRUint32 *countRead) +{ + *countRead = count; + return NS_OK; +} + // nsISupports implementation NS_IMPL_THREADSAFE_ISUPPORTS2(nsHTTPCompressConv, nsIStreamConverter, nsIStreamListener) @@ -132,10 +145,22 @@ PRUint32 aCount) { nsresult rv = NS_ERROR_FAILURE; - PRUint32 streamLen = aCount; + PRUint32 streamLen = aCount; - if (streamLen == 0 || mStreamEnded) - return NS_OK; // XXX an error code would make more sense, no? + if (streamLen == 0) + { + NS_ERROR("count of zero passed to OnDataAvailable"); + return NS_ERROR_UNEXPECTED; + } + + if (mStreamEnded) + { + // Hmm... this may just indicate that the data stream is done and that + // what's left is either metadata or padding of some sort.... throwing + // it out is probably the safe thing to do. + PRUint32 n; + return iStr->ReadSegments(DiscardSegments, nsnull, streamLen, &n); + } switch (mMode) { Index: nsprpub/pr/include/md/_openbsd.cfg =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_openbsd.cfg,v retrieving revision 3.6.4.2 diff -u -r3.6.4.2 _openbsd.cfg --- nsprpub/pr/include/md/_openbsd.cfg 10 Mar 2004 07:51:37 -0000 3.6.4.2 +++ nsprpub/pr/include/md/_openbsd.cfg 10 Mar 2005 02:04:59 -0000 @@ -282,6 +282,53 @@ #define PR_BYTES_PER_WORD_LOG2 3 #define PR_BYTES_PER_DWORD_LOG2 3 +#elif defined(__sparc_v9__) +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 +#define HAVE_LONG_LONG +#define HAVE_ALIGNED_DOUBLES +#define HAVE_ALIGNED_LONGLONGS +#define IS_64 + +#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 8 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 8 +#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 64 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 64 + +#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 6 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 6 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 8 +#define PR_ALIGN_OF_INT64 8 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 8 +#define PR_ALIGN_OF_POINTER 8 + +#define PR_BYTES_PER_WORD_LOG2 3 +#define PR_BYTES_PER_DWORD_LOG2 3 + #elif defined(__powerpc__) || defined(__m68k__) #undef IS_LITTLE_ENDIAN Index: nsprpub/pr/src/io/prprf.c =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/prprf.c,v retrieving revision 3.10.2.6 diff -u -r3.10.2.6 prprf.c --- nsprpub/pr/src/io/prprf.c 9 Mar 2004 03:18:19 -0000 3.10.2.6 +++ nsprpub/pr/src/io/prprf.c 10 Mar 2005 02:04:59 -0000 @@ -53,6 +53,8 @@ */ #if (defined(LINUX) && defined(__x86_64__)) #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) +#elif (defined(__OpenBSD__) && defined(va_copy)) +#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar)) #elif (defined(LINUX) && defined(__powerpc__)) || \ (defined(LINUX) && defined(__s390__)) || \ (defined(LINUX) && defined(__s390x__)) || \ Index: nsprpub/pr/src/md/unix/unix.c =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/unix/unix.c,v retrieving revision 3.43.2.5 diff -u -r3.43.2.5 unix.c --- nsprpub/pr/src/md/unix/unix.c 12 Dec 2002 00:19:57 -0000 3.43.2.5 +++ nsprpub/pr/src/md/unix/unix.c 10 Mar 2005 02:05:00 -0000 @@ -65,7 +65,8 @@ * PRInt32* pointer to a _PRSockLen_t* pointer. */ #if defined(HAVE_SOCKLEN_T) \ - || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) + || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ + || defined(FREEBSD) #define _PRSockLen_t socklen_t #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ @@ -73,7 +74,7 @@ || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ || defined(NEXTSTEP) || defined(QNX) #define _PRSockLen_t int -#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ +#elif (defined(AIX) && !defined(AIX4_1)) \ || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ || defined(DGUX) || defined(VMS) || defined(NTO) #define _PRSockLen_t size_t Index: nsprpub/pr/src/misc/prinit.c =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/prinit.c,v retrieving revision 3.25.4.4 diff -u -r3.25.4.4 prinit.c --- nsprpub/pr/src/misc/prinit.c 20 Jan 2003 20:13:09 -0000 3.25.4.4 +++ nsprpub/pr/src/misc/prinit.c 10 Mar 2005 02:05:00 -0000 @@ -430,6 +430,12 @@ _PR_LogCleanup(); /* + * accesses the current thread + */ + _PR_CleanupNet(); + _PR_CleanupIO(); + + /* * This part should look like the end of _PR_NativeRunThread * and _PR_UserRunThread. */ @@ -441,6 +447,7 @@ PR_DELETE(me->stack); PR_DELETE(me); } + _PR_MD_SET_CURRENT_THREAD(NULL); /* * XXX: We are freeing the heap memory here so that Purify won't @@ -449,8 +456,6 @@ * Ideally, for each _PR_InitXXX(), there should be a corresponding * _PR_XXXCleanup() that we can call here. */ - _PR_CleanupNet(); - _PR_CleanupIO(); #ifdef WINNT _PR_CleanupCPUs(); #endif Index: nsprpub/pr/src/misc/prnetdb.c =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/prnetdb.c,v retrieving revision 3.21.2.20.6.1 diff -u -r3.21.2.20.6.1 prnetdb.c --- nsprpub/pr/src/misc/prnetdb.c 1 Sep 2004 23:07:28 -0000 3.21.2.20.6.1 +++ nsprpub/pr/src/misc/prnetdb.c 10 Mar 2005 02:05:00 -0000 @@ -2098,7 +2098,12 @@ */ hints.ai_socktype = SOCK_STREAM; + LOCK_DNS(); + rv = GETADDRINFO(hostname, NULL, &hints, &res); + + UNLOCK_DNS(); + if (rv == 0) return (PRAddrInfo *) res; Index: nsprpub/pr/src/pthreads/ptio.c =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/src/pthreads/ptio.c,v retrieving revision 3.71.2.16 diff -u -r3.71.2.16 ptio.c --- nsprpub/pr/src/pthreads/ptio.c 4 Feb 2004 01:31:33 -0000 3.71.2.16 +++ nsprpub/pr/src/pthreads/ptio.c 10 Mar 2005 02:05:01 -0000 @@ -192,7 +192,7 @@ #endif #endif -#ifdef DARWIN +#if defined(DARWIN) || defined(FREEBSD) static PRBool _pr_ipv6_v6only_on_by_default; /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */ #ifndef IPV6_V6ONLY @@ -1157,7 +1157,7 @@ _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE); PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr); -#ifdef DARWIN +#if defined(DARWIN) || defined(FREEBSD) /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option * is turned on by default, contrary to what RFC 3493, Section * 5.3 says. So we have to turn it off. Find out whether we @@ -3477,7 +3477,7 @@ if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); else { -#ifdef DARWIN +#if defined(DARWIN) || defined(FREEBSD) if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) { int on = 0; Index: rdf/chrome/src/nsChromeRegistry.cpp =================================================================== RCS file: /cvsroot/mozilla/rdf/chrome/src/nsChromeRegistry.cpp,v retrieving revision 1.297.2.1 diff -u -r1.297.2.1 nsChromeRegistry.cpp --- rdf/chrome/src/nsChromeRegistry.cpp 24 Apr 2004 17:15:39 -0000 1.297.2.1 +++ rdf/chrome/src/nsChromeRegistry.cpp 10 Mar 2005 02:05:06 -0000 @@ -2689,7 +2689,7 @@ return UninstallProvider(NS_LITERAL_CSTRING("locale"), aLocaleName, aUseProfile); } -NS_IMETHODIMP nsChromeRegistry::UninstallPackage(const PRUnichar* aPackageName, PRBool aUseProfile) +NS_IMETHODIMP nsChromeRegistry::UninstallPackage(const nsACString& aPackageName, PRBool aUseProfile) { NS_ERROR("XXX Write me!\n"); return NS_ERROR_FAILURE; Index: security/coreconf/OpenBSD.mk =================================================================== RCS file: /cvsroot/mozilla/security/coreconf/OpenBSD.mk,v retrieving revision 1.2 diff -u -r1.2 OpenBSD.mk --- security/coreconf/OpenBSD.mk 16 Sep 2003 20:50:50 -0000 1.2 +++ security/coreconf/OpenBSD.mk 10 Mar 2005 02:05:07 -0000 @@ -35,12 +35,12 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk -DEFAULT_COMPILER = gcc -CC = gcc -CCC = g++ +DEFAULT_COMPILER = ${CC} +#CC = ${CC} +CCC = ${CXX} RANLIB = ranlib -CPU_ARCH := $(shell uname -p) +CPU_ARCH := $(shell arch -s) ifeq ($(CPU_ARCH),i386) OS_REL_CFLAGS = -Di386 CPU_ARCH = x86 Index: widget/src/gtk/nsSound.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk/nsSound.cpp,v retrieving revision 1.37 diff -u -r1.37 nsSound.cpp --- widget/src/gtk/nsSound.cpp 7 Mar 2004 19:12:02 -0000 1.37 +++ widget/src/gtk/nsSound.cpp 10 Mar 2005 02:05:26 -0000 @@ -86,7 +86,7 @@ EsdOpenSoundType EsdOpenSound; - elib = PR_LoadLibrary("libesd.so.0"); + elib = PR_LoadLibrary("libesd.so"); if (!elib) return NS_ERROR_FAILURE; EsdOpenSound = (EsdOpenSoundType) PR_FindSymbol(elib, "esd_open_sound"); Index: widget/src/gtk2/nsSound.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsSound.cpp,v retrieving revision 1.8 diff -u -r1.8 nsSound.cpp --- widget/src/gtk2/nsSound.cpp 7 Mar 2004 19:12:21 -0000 1.8 +++ widget/src/gtk2/nsSound.cpp 10 Mar 2005 02:05:26 -0000 @@ -91,7 +91,7 @@ EsdOpenSoundType EsdOpenSound; - elib = PR_LoadLibrary("libesd.so.0"); + elib = PR_LoadLibrary("libesd.so"); if (!elib) return NS_ERROR_FAILURE; EsdOpenSound = (EsdOpenSoundType) PR_FindSymbol(elib, "esd_open_sound"); Index: xpcom/io/nsNativeCharsetUtils.cpp =================================================================== RCS file: /cvsroot/mozilla/xpcom/io/nsNativeCharsetUtils.cpp,v retrieving revision 1.25.2.1.2.2 diff -u -r1.25.2.1.2.2 nsNativeCharsetUtils.cpp --- xpcom/io/nsNativeCharsetUtils.cpp 9 Nov 2004 20:46:03 -0000 1.25.2.1.2.2 +++ xpcom/io/nsNativeCharsetUtils.cpp 10 Mar 2005 02:05:28 -0000 @@ -329,7 +329,11 @@ { const char *blank_list[] = { "", NULL }; const char **native_charset_list = blank_list; +#ifdef CODESET const char *native_charset = nl_langinfo(CODESET); +#else + const char *native_charset = nsnull; +#endif if (native_charset == nsnull) { NS_ERROR("native charset is unknown"); // fallback to ISO-8859-1 Index: xpcom/reflect/xptcall/src/md/unix/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in,v retrieving revision 1.75.2.1 diff -u -r1.75.2.1 Makefile.in --- xpcom/reflect/xptcall/src/md/unix/Makefile.in 22 Apr 2004 20:50:05 -0000 1.75.2.1 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 10 Mar 2005 02:05:29 -0000 @@ -111,6 +111,12 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # +# OpenBSD/Alpha +# +ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDalpha) +CPPSRCS := xptcinvoke_openbsd_alpha.cpp xptcstubs_openbsd_alpha.cpp +endif +# # Linux/Alpha # ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) @@ -260,6 +266,14 @@ endif # +# OpenBSD/PPC +# +ifneq (,$(filter OpenBSDmacppc,$(OS_ARCH)$(OS_TEST))) +CPPSRCS := xptcinvoke_ppc_openbsd.cpp xptcstubs_ppc_openbsd.cpp +ASFILES := xptcinvoke_asm_ppc_openbsd.s xptcstubs_asm_ppc_openbsd.s +endif + +# # Darwin/PPC # ifeq ($(OS_ARCH),Darwin) @@ -332,6 +346,20 @@ endif endif +# +# OpenBSD/SPARC +# +ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) +CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp +ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s +endif +# +# OpenBSD/SPARC64 +# +ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) +CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp +ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparcv9_solaris.s +endif ###################################################################### # S/390 Index: xpcom/sample/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/xpcom/sample/Makefile.in,v retrieving revision 1.34 diff -u -r1.34 Makefile.in --- xpcom/sample/Makefile.in 19 Feb 2004 02:43:46 -0000 1.34 +++ xpcom/sample/Makefile.in 10 Mar 2005 02:05:29 -0000 @@ -52,7 +52,7 @@ TESTCPPSRCS = nsTestSample.cpp -CPPSRCS += $(TESTCPPSRCS) +#CPPSRCS += $(TESTCPPSRCS) SIMPLE_PROGRAMS = $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX))