PERFORCE change 49422 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=49422

Change 49422 by peter at peter_overcee on 2004/03/20 17:50:46

	IFC @49421

Affected files ...

.. //depot/projects/hammer/lib/csu/amd64/crti.S#6 integrate
.. //depot/projects/hammer/lib/csu/amd64/crtn.S#6 integrate
.. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#14 integrate
.. //depot/projects/hammer/sys/ia64/include/cpufunc.h#8 integrate

Differences ...

==== //depot/projects/hammer/lib/csu/amd64/crti.S#6 (text+ko) ====

@@ -38,4 +38,4 @@
 	subq	$8,%rsp
 
 	.section .rodata
-.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.6 2002/05/15 04:19:49 obrien Exp $\0"
+.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.7 2004/03/21 01:39:01 peter Exp $\0"

==== //depot/projects/hammer/lib/csu/amd64/crtn.S#6 (text+ko) ====

@@ -32,4 +32,4 @@
 	ret
 
 	.section .rodata
-.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.5 2002/05/15 04:19:49 obrien Exp $\0"
+.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.6 2004/03/21 01:39:01 peter Exp $\0"

==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#14 (text+ko) ====

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_start.S,v 1.4 2003/05/24 17:37:51 peter Exp $
+ * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_start.S,v 1.5 2004/03/21 01:43:39 peter Exp $
  */
 
 	.text

==== //depot/projects/hammer/sys/ia64/include/cpufunc.h#8 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/ia64/include/cpufunc.h,v 1.19 2004/01/13 15:30:36 des Exp $
+ * $FreeBSD: src/sys/ia64/include/cpufunc.h,v 1.20 2004/03/21 01:41:29 marcel Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
@@ -37,15 +37,16 @@
 
 struct thread;
 
+#define	IA64_FIXED_BREAK	0x84B5D
+
 #ifdef __GNUC__
 
 static __inline void
 breakpoint(void)
 {
-	__asm __volatile("break 0x80100"); /* XXX use linux value */
+	__asm __volatile("break.m %0" :: "i"(IA64_FIXED_BREAK));
 }
 
-
 #define	HAVE_INLINE_FFS
 
 static __inline int