From owner-p4-projects  Mon May  6  0:21:38 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F098237B411; Mon,  6 May 2002 00:21:25 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3FC5F37B62B
	for <perforce@freebsd.org>; Mon,  6 May 2002 00:19:41 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g467JCY92734
	for perforce@freebsd.org; Mon, 6 May 2002 00:19:12 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Date: Mon, 6 May 2002 00:19:12 -0700 (PDT)
Message-Id: <200205060719.g467JCY92734@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 10878 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10878

Change 10878 by marcel@marcel_vaio on 2002/05/06 00:18:07

	We need libc_r if we want to build X libraries. Make it so.
	This still needs testing.

Affected files ...

... //depot/projects/ia64/lib/Makefile#9 edit
... //depot/projects/ia64/lib/libc_r/arch/ia64/_atomic_lock.S#1 add
... //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#5 edit

Differences ...

==== //depot/projects/ia64/lib/Makefile#9 (text+ko) ====

@@ -44,7 +44,7 @@
 _libresolv=	libresolv
 .endif
 
-.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != ia64
+.if !defined(NOLIBC_R)
 _libc_r=	libc_r
 .endif
 

==== //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#5 (text+ko) ====

@@ -101,6 +101,17 @@
 	(jb)[0]._jb[R_RA + 4] = (long)(ra);		\
 	(jb)[0]._jb[R_T12 + 4] = (long)(ra);		\
 } while (0)
+#elif	defined(__ia64__)
+#define	GET_STACK_JB(jb)	(*((unsigned long*)JMPBUF_ADDR_OF(jb,J_SP)))
+#define	GET_STACK_SJB(sjb)	(*((unsigned long*)JMPBUF_ADDR_OF(sjb,J_SP)))
+#define	GET_STACK_UC(ucp)	((ucp)->uc_mcontext.mc_sp)
+#define	SET_STACK_JB(jb, stk)	GET_STACK_JB(jb) = (long)(stk)
+#define	SET_STACK_SJB(sjb, stk)	GET_STACK_SJB(sjb) = (long)(stk)
+#define	SET_STACK_UC(ucp, stk)	(ucp)->uc_mcontext.mc_sp = (unsigned long)(stk)
+#define	FP_SAVE_UC(ucp)
+#define	FP_RESTORE_UC(ucp)
+#define SET_RETURN_ADDR_JB(jb, ra)	\
+	(*((unsigned long*)JMPBUF_ADDR_OF(jb,J_B0)) = (long)(ra))
 #else
 #error "Don't recognize this architecture!"
 #endif

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message