From owner-p4-projects@FreeBSD.ORG Fri Mar 18 02:25:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADA8716A4D0; Fri, 18 Mar 2005 02:25:20 +0000 (GMT) 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 5EEE916A4CE for ; Fri, 18 Mar 2005 02:25:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1080C43D2D for ; Fri, 18 Mar 2005 02:25:20 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2I2PJmD044853 for ; Fri, 18 Mar 2005 02:25:19 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2I2PJtX044850 for perforce@freebsd.org; Fri, 18 Mar 2005 02:25:19 GMT (envelope-from jmallett@freebsd.org) Date: Fri, 18 Mar 2005 02:25:19 GMT Message-Id: <200503180225.j2I2PJtX044850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 73419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Mar 2005 02:25:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=73419 Change 73419 by jmallett@jmallett_windward on 2005/03/18 02:24:42 Hack hack hack. It's like giving a haircut using a lawnmower. Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#15 edit .. //depot/projects/mips/gnu/usr.bin/binutils/Makefile.inc0#8 edit .. //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile#4 edit .. //depot/projects/mips/gnu/usr.bin/binutils/as/config.h#2 edit .. //depot/projects/mips/gnu/usr.bin/binutils/as/mips-freebsd/Makefile#2 delete .. //depot/projects/mips/gnu/usr.bin/binutils/as/mips-freebsd/config.h#8 delete .. //depot/projects/mips/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#3 edit .. //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile.mips#11 edit .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#13 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#15 (text+ko) ==== @@ -41,9 +41,6 @@ /* mips.h gets this wrong for FreeBSD. We use the GCC defaults instead. */ #undef WCHAR_TYPE -#undef WCHAR_UNSIGNED -#define WCHAR_UNSIGNED 0 - #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE 32 ==== //depot/projects/mips/gnu/usr.bin/binutils/Makefile.inc0#8 (text+ko) ==== @@ -7,12 +7,17 @@ VERSION= "2.15 [FreeBSD] 2004-05-23" TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "mips" +BINUTILS_ARCH=mips64 +TARGET_TUPLE?= ${BINUTILS_ARCH}-juli-freebsd +.else .if ${TARGET_ARCH} == "amd64" BINUTILS_ARCH=x86_64 .else BINUTILS_ARCH=${TARGET_ARCH} .endif TARGET_TUPLE?= ${BINUTILS_ARCH}-obrien-freebsd +.endif # RELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes ==== //depot/projects/mips/gnu/usr.bin/binutils/as/Makefile#4 (text+ko) ==== @@ -17,8 +17,10 @@ input-scrub.c listing.c literal.c macro.c messages.c \ obj-elf.c output-file.c read.c sb.c stabs.c \ subsegs.c symbols.c write.c depend.c ehopt.c dw2gencfi.c -# DEO: why not used? -#SRCS+= itbl-ops.c + +.if ${TARGET_ARCH} == "mips" +SRCS+= itbl-ops.c +.endif .if ${TARGET_ARCH} == "amd64" SRCS+= tc-i386.c ==== //depot/projects/mips/gnu/usr.bin/binutils/as/config.h#2 (text+ko) ==== @@ -164,16 +164,16 @@ /* #undef TARGET_BYTES_BIG_ENDIAN */ /* Default CPU for MIPS targets. */ -/* #undef MIPS_CPU_STRING_DEFAULT */ +#define MIPS_CPU_STRING_DEFAULT "r4000" /* Allow use of E_MIPS_ABI_O32 on MIPS targets. */ -/* #undef USE_E_MIPS_ABI_O32 */ +#define USE_E_MIPS_ABI_O32 0 /* Generate 64-bit code by default on MIPS targets. */ -/* #undef MIPS_DEFAULT_64BIT */ +#define MIPS_DEFAULT_64BIT 1 /* Choose a default ABI for MIPS targets. */ -/* #undef MIPS_DEFAULT_ABI */ +#define MIPS_DEFAULT_ABI N64_ABI /* Default architecture. */ /* #define DEFAULT_ARCH "i386" */ ==== //depot/projects/mips/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#3 (text+ko) ==== @@ -1,6 +1,3 @@ /* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h,v 1.2 2002/05/18 04:50:32 obrien Exp $ */ -/* Values for processors will be from 0 to NUMBER_OF_PROCESSORS-1 */ -#define NUMBER_OF_PROCESSORS 1 - #include "itbl-mips.h" ==== //depot/projects/mips/gnu/usr.bin/binutils/ld/Makefile.mips#11 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -TARGET_TUPLE= mips-jmallett-freebsd +TARGET_TUPLE= mips-juli-freebsd .if ${TARGET_ARCH} == "mips" DEFAULT_EMULATION?= elf32btsmipn32 ==== //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#13 (text+ko) ==== @@ -214,9 +214,6 @@ .if ${TARGET_ARCH} == "amd64" TARGET_INC= i386/biarch64.h .endif -.if ${TARGET_ARCH} == "mips" -TARGET_INC+= ${GCC_CPU}/freebsd.h -.endif TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h @@ -240,9 +237,7 @@ TARGET_INC+= ${GCC_CPU}/sysv4.h .endif .endif -.if ${TARGET_ARCH} != "mips" TARGET_INC+= ${GCC_CPU}/freebsd.h -.endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h TARGET_INC+= ${GCC_CPU}/freebsd64.h