Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Sep 2009 13:00:08 +0400
From:      Anonymous <swell.k@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/139205: [patch] archivers/xz: define x86_64 on amd64
Message-ID:  <86fxa730mf.fsf@gmail.com>
Resent-Message-ID: <200909280910.n8S9A292038747@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         139205
>Category:       ports
>Synopsis:       [patch] archivers/xz: define x86_64 on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 28 09:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD 9.0-CURRENT #2 r197528M: Sat Sep 26 20:24:09 UTC 2009     root@luffy:/usr/obj/usr/src/sys/PHOENIX  amd64
>Description:
amd64 is actually X86_64, so define it there. Affects assembler
optimization in liblzma/common/bsr.h.
>How-To-Repeat:
1. $ make configure
2. check contents of ${WRKSRC}/config.h

On i386 it would have HAVE_ASM_X86 and HAVE_FAST_UNALIGNED_ACCESS defined.
>Fix:
--- xz.diff begins here ---
Index: archivers/xz/files/patch-configure
===================================================================
RCS file: archivers/xz/files/patch-configure
diff -N archivers/xz/files/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ archivers/xz/files/patch-configure	28 Sep 2009 08:53:00 -0000
@@ -0,0 +1,20 @@
+--- configure.orig	2009-09-28 12:51:19.476208211 +0400
++++ configure	2009-09-28 12:51:29.547312607 +0400
+@@ -3882,7 +3882,7 @@ fi
+ if test "x$enable_assembler" = xyes; then
+ 	case $host_cpu in
+ 		i?86)   enable_assembler=x86 ;;
+-		x86_64) enable_assembler=x86_64 ;;
++		x86_64|amd64) enable_assembler=x86_64 ;;
+ 		*)      enable_assembler=no ;;
+ 	esac
+ fi
+@@ -3940,7 +3940,7 @@ fi
+ 
+ if test "x$enable_unaligned_access" = xauto ; then
+ 	case $host_cpu in
+-		i?86|x86_64|powerpc|powerpc64)
++		i?86|x86_64|amd64|powerpc|powerpc64)
+ 			enable_unaligned_access=yes
+ 			;;
+ 		*)
--- xz.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86fxa730mf.fsf>