From owner-p4-projects@FreeBSD.ORG Tue Jul 25 05:48:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20A5816A4DF; Tue, 25 Jul 2006 05:48:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA36A16A4DA for ; Tue, 25 Jul 2006 05:48:15 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6821043D4C for ; Tue, 25 Jul 2006 05:48:15 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6P5mFxk097485 for ; Tue, 25 Jul 2006 05:48:15 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6P5mE91097482 for perforce@freebsd.org; Tue, 25 Jul 2006 05:48:14 GMT (envelope-from kevlo@freebsd.org) Date: Tue, 25 Jul 2006 05:48:14 GMT Message-Id: <200607250548.k6P5mE91097482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 102351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 05:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=102351 Change 102351 by kevlo@kevlo_monet on 2006/07/25 05:47:56 Regen the gnu patch, apply it cleanly on current src tree. Affected files ... .. //depot/projects/arm/gnu-arm.diff#17 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#17 (text+ko) ==== @@ -95,58 +95,56 @@ =================================================================== RCS file: gnu/usr.bin/binutils/ld/Makefile.arm diff -N gnu/usr.bin/binutils/ld/Makefile.arm ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/ld/Makefile.arm 21 Jul 2006 12:53:38 -0000 -@@ -0,0 +1,16 @@ -+# $FreeBSD$ -+ +--- ld.orig/Makefile.arm Tue Jul 25 11:25:14 2006 ++++ ld/Makefile.arm Tue Jul 25 11:27:44 2006 +@@ -1,6 +1,10 @@ + # $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.1 2006/07/22 14:36:15 obrien Exp $ + +.if defined(ARM_BIG_ENDIAN) -+NATIVE_EMULATION= armelfb_fbsd ++NATIVE_EMULATION= armelfb_fbsd +.else -+NATIVE_EMULATION= armelf_fbsd + NATIVE_EMULATION= armelf_fbsd +.endif -+ -+SRCS+= e${NATIVE_EMULATION}.c -+CLEANFILES+= e${NATIVE_EMULATION}.c -+e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ -+ scripttempl/elf.sc genscripts.sh stringify.sed -+ sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ -+ ${TOOLS_PREFIX}/usr \ -+ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ -+ "${NATIVE_EMULATION}" "" no ${NATIVE_EMULATION} "${TARGET_TUPLE}" + + SRCS+= e${NATIVE_EMULATION}.c + CLEANFILES+= e${NATIVE_EMULATION}.c Index: gnu/usr.bin/binutils/libbfd/Makefile.arm =================================================================== RCS file: gnu/usr.bin/binutils/libbfd/Makefile.arm diff -N gnu/usr.bin/binutils/libbfd/Makefile.arm ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/libbfd/Makefile.arm 21 Jul 2006 00:22:53 -0000 -@@ -0,0 +1,49 @@ -+# $FreeBSD$ -+ +--- gnu/usr.bin/binutils/libbfd.orig/Makefile.arm Tue Jul 25 10:59:44 2006 ++++ gnu/usr.bin/binutils/libbfd/Makefile.arm Tue Jul 25 10:58:56 2006 +@@ -1,14 +1,47 @@ + # $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.2 2006/07/22 14:55:55 obrien Exp $ + +-DEFAULT_VECTOR= bfd_elf32_littlearm_vec +.if defined(ARM_BIG_ENDIAN) +DEFAULT_VECTOR= bfd_elf32_bigarm_vec +ADDITIONAL_VECTOR= bfd_elf32_littlearm_vec +.else -+DEFAULT_VECTOR= bfd_elf32_littlearm_vec ++DEFAULT_VECTOR= bfd_elf32_littlearm_vec +ADDITIONAL_VECTOR= bfd_elf32_bigarm_vec +.endif -+ -+SRCS+= \ -+ cpu-arm.c \ -+ elf32.c \ -+ elf32-gen.c \ -+ elflink.c \ -+ elfarm-oabi.c \ -+ elf32-arm-fbsd.c \ -+ elf32-target.h -+VECS+= ${DEFAULT_VECTOR} \ + + SRCS+= cpu-arm.c \ + elf32.c \ + elf32-arm-fbsd.c \ + elf32-gen.c \ +- elf32-target.h +- elfarm-nabi.c \ ++ elf32-target.h \ ++ elfarm-oabi.c \ + elflink.c + + VECS= ${DEFAULT_VECTOR} \ +- bfd_elf32_bigarm_vec + ${ADDITIONAL_VECTOR} + +.if ${TARGET_ARCH} == "arm" +CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} +.endif + -+CLEANFILES+= elf32-arm-fbsd.c ++CLEANFILES+= elf32-arm-fbsd.c + +elf32-arm-fbsd.c: elfarm-nabi.c + cat ${.ALLSRC} | sed -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \ @@ -158,18 +156,17 @@ + int offset; \ + if (note->descsz != 96) \ + return (FALSE); \ -+ offset = 28; \ -+ raw_size = 68; \ -+ if (elf_tdata(abfd)->core_signal == 0) \ -+ elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \ -+ elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \ -+ /* Make a ".reg/999" section. */ \ -+ return _bfd_elfcore_make_pseudosection (abfd, ".reg", \ -+ raw_size, note->descpos + offset); \ -+}' >> ${.TARGET}; \ ++ offset = 28; \ ++ raw_size = 68; \ ++ if (elf_tdata(abfd)->core_signal == 0) \ ++ elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \ ++ elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \ ++ /* Make a ".reg/999" section. */ \ ++ return _bfd_elfcore_make_pseudosection (abfd, ".reg", \ ++ raw_size, note->descpos + offset); \ ++ }' >> ${.TARGET}; \ + echo '#include "elf32-arm.h"' >> ${.TARGET} -+ -+ + Index: gnu/usr.bin/binutils/libiberty/Makefile =================================================================== RCS file: /cognet/ncvs/src/gnu/usr.bin/binutils/libiberty/Makefile,v @@ -272,22 +269,6 @@ TARGET_INC+= ${GCC_CPU}/freebsd.h .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h -Index: gnu/usr.bin/cc/cc_tools/auto-host.h -=================================================================== -RCS file: /cognet/ncvs/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v -retrieving revision 1.18 -diff -u -p -r1.18 auto-host.h ---- gnu/usr.bin/cc/cc_tools/auto-host.h 28 Jul 2004 05:27:20 -0000 1.18 -+++ gnu/usr.bin/cc/cc_tools/auto-host.h 6 Jul 2006 23:54:06 -0000 -@@ -523,7 +523,7 @@ - /* The number of bytes in type int */ - #define SIZEOF_INT 4 - --#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) -+#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) - /* The number of bytes in type long */ - # define SIZEOF_LONG SIZEOF_INT - #elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__) Index: gnu/usr.bin/gdb/arch/arm/Makefile =================================================================== RCS file: gnu/usr.bin/gdb/arch/arm/Makefile