rest of amd64, cvs is piece of shit

This commit is contained in:
pvalchev 2004-03-02 08:34:57 +00:00
parent fe295636fd
commit 0baad5284c
3 changed files with 40 additions and 24 deletions

View File

@ -1,9 +1,18 @@
$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.2 2004/03/01 23:51:58 drahn Exp $
--- nsprpub/pr/include/md/_openbsd.h.orig 2004-03-01 17:54:03.000000000 -0500
+++ nsprpub/pr/include/md/_openbsd.h 2004-03-01 17:50:51.000000000 -0500
@@ -71,6 +71,12 @@
#define _PR_HAVE_SYSV_SEMAPHORES
#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.3 2004/03/02 08:34:57 pvalchev Exp $
--- nsprpub/pr/include/md/_openbsd.h.orig 2004-03-01 17:36:44.000000000 -0700
+++ nsprpub/pr/include/md/_openbsd.h 2004-03-01 17:42:08.000000000 -0700
@@ -43,6 +43,8 @@
#define _PR_SI_ARCHITECTURE "x86"
#elif defined(__alpha__)
#define _PR_SI_ARCHITECTURE "alpha"
+#elif defined(__amd64__)
+#define _PR_SI_ARCHITECTURE "amd64"
#elif defined(__m68k__)
#define _PR_SI_ARCHITECTURE "m68k"
#elif defined(__powerpc__)
@@ -77,6 +79,12 @@
#define _PR_HAVE_GETADDRINFO
#define _PR_INET6_PROBE
+#define _PR_INET6
+#define _PR_HAVE_INET_NTOP
@ -14,15 +23,12 @@ $OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.2 2004/03/01 23:51:58 drahn
#define USE_SETJMP
#ifndef _PR_PTHREADS
@@ -80,8 +86,10 @@
#define CONTEXT(_th) ((_th)->md.context)
-#if defined(__i386__) || defined(__sparc__) || defined(__m68k__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__sparc__) || defined(__m68k__)
#define JB_SP_INDEX 2
+#elif defined(__powerpc__)
+#define JB_SP_INDEX 1
@@ -92,6 +100,8 @@
#define JB_SP_INDEX 1
#elif defined(__alpha__)
#define JB_SP_INDEX 34
+#elif defined(__amd64__)
+#define JB_SP_INDEX 6
#elif defined(__arm32__)
/*
* On the arm32, the jmpbuf regs underwent a name change after OpenBSD 1.3.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.8 2004/02/15 19:44:01 wilfried Exp $
--- security/coreconf/OpenBSD.mk.orig 2003-09-16 22:50:50.000000000 +0200
+++ security/coreconf/OpenBSD.mk 2004-02-10 13:53:56.000000000 +0100
@@ -35,9 +35,9 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.9 2004/03/02 08:34:57 pvalchev Exp $
--- security/coreconf/OpenBSD.mk.orig 2003-09-16 14:50:50.000000000 -0600
+++ security/coreconf/OpenBSD.mk 2004-03-01 17:45:03.000000000 -0700
@@ -35,12 +35,12 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@ -13,7 +13,11 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.8 2004/02/15 19:44:01 wilfried
+CCC = ${CXX}
RANLIB = ranlib
CPU_ARCH := $(shell uname -p)
-CPU_ARCH := $(shell uname -p)
+CPU_ARCH := $(shell arch -s)
ifeq ($(CPU_ARCH),i386)
OS_REL_CFLAGS = -Di386
CPU_ARCH = x86
@@ -62,7 +62,7 @@ OS_LIBS =
ARCH = openbsd

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.5 2004/01/18 10:49:33 wilfried Exp $
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2003-08-15 06:00:23.000000000 +0200
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2003-12-12 15:43:29.000000000 +0100
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.6 2004/03/02 08:34:57 pvalchev Exp $
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2003-08-14 22:00:23.000000000 -0600
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-03-01 17:46:24.000000000 -0700
@@ -106,6 +106,12 @@ CPPSRCS := xptcinvoke_osf1_alpha.cpp xp
ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
endif
@ -29,7 +29,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.5 2004/01/18 1
# Darwin/PPC
#
ifeq ($(OS_ARCH),Darwin)
@@ -322,6 +336,20 @@ endif
@@ -322,6 +336,26 @@ endif
endif
endif
@ -46,6 +46,12 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.5 2004/01/18 1
+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
+#
+# OpenBSD/amd64
+#
+ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDamd64)
+CPPSRCS := xptcinvoke_openbsd_amd64.cpp xptcstubs_openbsd_amd64.cpp
+endif
######################################################################