From owner-p4-projects@FreeBSD.ORG Fri Sep 15 05:22:31 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 442CD16A417; Fri, 15 Sep 2006 05:22:31 +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 0824F16A407 for ; Fri, 15 Sep 2006 05:22:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1450B43D5E for ; Fri, 15 Sep 2006 05:22:30 +0000 (GMT) (envelope-from imp@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 k8F5MTi1034306 for ; Fri, 15 Sep 2006 05:22:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8F5MS0u034303 for perforce@freebsd.org; Fri, 15 Sep 2006 05:22:28 GMT (envelope-from imp@freebsd.org) Date: Fri, 15 Sep 2006 05:22:28 GMT Message-Id: <200609150522.k8F5MS0u034303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106130 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: Fri, 15 Sep 2006 05:22:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=106130 Change 106130 by imp@imp_paco-paco on 2006/09/15 05:22:01 IFC @106102 + fix to not have the default code generator be xscale. Affected files ... .. //depot/projects/arm/src/gnu/usr.bin/binutils/ld/Makefile.arm#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.tgt#2 edit .. //depot/projects/arm/src/gnu/usr.bin/cc/cpp/Makefile#2 integrate Differences ... ==== //depot/projects/arm/src/gnu/usr.bin/binutils/ld/Makefile.arm#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.1 2006/07/22 14:36:15 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.2 2006/09/12 06:59:39 obrien Exp $ -.if defined(ARM_BIG_ENDIAN) +.if defined(TARGET_BIG_ENDIAN) NATIVE_EMULATION= armelfb_fbsd .else NATIVE_EMULATION= armelf_fbsd ==== //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#4 (text+ko) ==== @@ -1,52 +1,44 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.3 2006/08/10 16:39:55 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.5 2006/09/12 07:03:58 obrien Exp $ -.if defined(ARM_BIG_ENDIAN) -DEFAULT_VECTOR= bfd_elf32_bigarm_vec -ADDITIONAL_VECTOR= bfd_elf32_littlearm_vec +.if defined(TARGET_BIG_ENDIAN) +DEFAULT_VECTOR= bfd_elf32_bigarm_vec .else DEFAULT_VECTOR= bfd_elf32_littlearm_vec -ADDITIONAL_VECTOR= bfd_elf32_bigarm_vec .endif -SRCS+= \ - cpu-arm.c \ - elf32.c \ +SRCS+= cpu-arm.c \ elf32-arm-fbsd.c \ + elf32.c \ elf32-gen.c \ elf32-target.h \ - elflink.c -VECS+= ${DEFAULT_VECTOR} \ - ${ADDITIONAL_VECTOR} - -.if ${TARGET_ARCH} == "arm" -CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} + elflink.c +VECS+= ${DEFAULT_VECTOR} +.if defined(TARGET_BIG_ENDIAN) +VECS+= bfd_elf32_littlearm_vec +.else +VECS+= bfd_elf32_bigarm_vec .endif CLEANFILES+= elf32-arm-fbsd.c -# # XXX: We should really add the FreeBSD case in elf32_arm_nabi_grok_prstatus # instead of defining our own elf32_fbsd_arm_grok_prstatus. # elf32-arm-fbsd.c: elfarm-nabi.c - cat ${.ALLSRC} | sed -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \ - -e "s/\(.*#define.*\)elf32_arm_nabi_grok_prstatus/\1elf32_fbsd_arm_grok_prstatus/" -e s/"#include.*elf32-arm.h.*//" >${.TARGET}; \ + cat ${.ALLSRC} | sed \ + -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \ + -e "s/\(.*#define.*\)elf32_arm_nabi_grok_prstatus/\1elf32_fbsd_arm_grok_prstatus/" \ + -e s/"#include.*elf32-arm.h.*//" >${.TARGET} echo '\ - static bfd_boolean elf32_fbsd_arm_grok_prstatus(bfd *abfd, Elf_Internal_Note *note) \ - { \ - size_t raw_size; \ - int offset; \ - if (note->descsz != 96) \ - return (FALSE); \ - offset = 28; \ - raw_size = 68; \ - if (elf_tdata(abfd)->core_signal == 0) \ + static bfd_boolean \ + elf32_fbsd_arm_grok_prstatus(bfd *abfd, Elf_Internal_Note *note) \ + { size_t raw_size =68 ; int offset = 28; \ + if (note->descsz != 96) return (FALSE); \ + 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}; \ + 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} - - ==== //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.tgt#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8 2004/07/28 05:27:19 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.9 2006/09/12 07:37:02 obrien Exp $ TARGET_ARCH?= ${MACHINE_ARCH} @@ -6,6 +6,10 @@ GCC_CPU= alpha .elif ${TARGET_ARCH} == "arm" GCC_CPU= arm +####TARGET_CPU_DEFAULT= TARGET_CPU_xscale +.if defined(TARGET_BIG_ENDIAN) +CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END +.endif .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" GCC_CPU= i386 .elif ${TARGET_ARCH} == "ia64" ==== //depot/projects/arm/src/gnu/usr.bin/cc/cpp/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.24 2004/02/05 22:44:21 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.25 2006/09/12 21:57:28 kan Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -8,9 +8,6 @@ PROG= cpp SRCS= gcc.c cppspec.c -CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" -CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" - DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT}