From owner-freebsd-x11@FreeBSD.ORG  Wed Feb 11 15:27:02 2004
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: freebsd-x11@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AC9A316A4CE
	for <freebsd-x11@freebsd.org>; Wed, 11 Feb 2004 15:27:02 -0800 (PST)
Received: from mail-in-01.arcor-online.net (mail-in-01.arcor-online.net
	[151.189.21.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7C58643D1D
	for <freebsd-x11@freebsd.org>; Wed, 11 Feb 2004 15:27:02 -0800 (PST)
	(envelope-from mailnull@mips.inka.de)
Received: from kemoauc.mips.inka.de (dsl-082-082-077-215.arcor-ip.net
	[82.82.77.215])
	by mail-in-01.arcor-online.net (Postfix) with ESMTP id 466B1883656
	for <freebsd-x11@freebsd.org>; Thu, 12 Feb 2004 00:27:01 +0100 (CET)
Received: from kemoauc.mips.inka.de (localhost [127.0.0.1])
	by kemoauc.mips.inka.de (8.12.10/8.12.10) with ESMTP id i1BNR0hw036404
	for <freebsd-x11@freebsd.org>; Thu, 12 Feb 2004 00:27:00 +0100 (CET)
	(envelope-from mailnull@kemoauc.mips.inka.de)
Received: (from mailnull@localhost)
	by kemoauc.mips.inka.de (8.12.10/8.12.10/Submit) id i1BNR0tH036403
	for freebsd-x11@freebsd.org; Thu, 12 Feb 2004 00:27:00 +0100 (CET)
	(envelope-from mailnull)
From: naddy@mips.inka.de (Christian Weisgerber)
Date: Wed, 11 Feb 2004 23:26:59 +0000 (UTC)
Message-ID: <c0edo3$13ha$1@kemoauc.mips.inka.de>
References: <20040209114613.GA13705@xor.obsecurity.org>
Originator: naddy@mips.inka.de (Christian Weisgerber)
To: freebsd-x11@freebsd.org
Subject: Re: XFree86-Server-4.3.0_12 broken on alpha 5.x
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2004 23:27:02 -0000

Kris Kennaway <kris@obsecurity.org> wrote:

> http://bento.freebsd.org/errorlogs/alpha-5-latest/XFree86-Server-4.3.0_12.log

This also affects XFree86-4.3.99.15_1.  It is caused by revision
1.7 of <include/sysarch.h>, which now declares

int             sysarch(int, void *);


By contrast, xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c
has this:

#ifdef __FreeBSD__
extern int sysarch(int, char *);
#endif

...

static int
sethae(u_int64_t hae)
{
#ifdef __FreeBSD__
#ifndef ALPHA_SETHAE
#define ALPHA_SETHAE 0
#endif
        struct parms p;
        p.hae = hae;
        return (sysarch(ALPHA_SETHAE, (char *)&p));
#endif


Is there a problem with just moving to void* in alpha_video.c?  It
should still work fine on 4.x.

--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig	Thu Feb 12 00:21:27 2004
+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c	Thu Feb 12 00:21:46 2004
@@ -483,7 +483,7 @@
 writeSparse32(int Value, pointer Base, register unsigned long Offset);
 
 #ifdef __FreeBSD__
-extern int sysarch(int, char *);
+extern int sysarch(int, void *);
 #endif
 
 struct parms {
@@ -499,7 +499,7 @@
 #endif
 	struct parms p;
 	p.hae = hae;
-	return (sysarch(ALPHA_SETHAE, (char *)&p));
+	return (sysarch(ALPHA_SETHAE, &p));
 #endif
 #ifdef __OpenBSD__
 	return -1;
-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de