Date: Sat, 26 Apr 2003 14:55:15 -0700 (PDT) From: "David E. O'Brien" <obrien@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 29823 for review Message-ID: <200304262155.h3QLtFEi042044@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=29823 Change 29823 by obrien@obrien_trang on 2003/04/26 14:55:03 MFC the amd64 toolchain changes. Affected files ... .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.h#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/as/amd64-freebsd/config.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/as/x86-64-freebsd/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/x86-64-freebsd/config.h#4 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/x86-64-freebsd/itbl-cpu.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/x86-64-freebsd/targ-cpu.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.x86-64#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.x86-64#3 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/amd64/bfd.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/x86-64/bfd.h#3 delete .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile.tgt#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/auto-host.h#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/include/Makefile#4 integrate Differences ... ==== //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#4 (text+ko) ==== @@ -22,12 +22,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.60 2003/04/13 01:04:01 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.61 2003/04/26 19:16:54 obrien Exp $ */ #undef CC1_SPEC -#define CC1_SPEC "%(cc1_cpu) %{profile:-p} \ - %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ - " +#define CC1_SPEC "%(cc1_cpu) %{profile:-p}" #undef ASM_SPEC #define ASM_SPEC "%{v*: -v}" ==== //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#2 (text+ko) ==== @@ -19,7 +19,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.2 2002/06/21 22:54:24 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.4 2003/04/26 19:20:25 obrien Exp $ */ #undef TARGET_VERSION @@ -29,20 +29,9 @@ This is a copy of LINK_SPEC from <i386/freebsd.h> tweaked for the x86-64 target. */ -#undef CC1_SPEC -#define CC1_SPEC "%(cc1_cpu) %{profile:-p} \ - %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ - %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - -#undef ASM_SPEC -#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}} \ - %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ - %{Wa,*:%*} %{m32:--32}" - #undef LINK_SPEC #define LINK_SPEC "\ - %{!m32:-m elf_x86_64} \ - %{m32:-m elf_i386} \ + %{m32:-m elf_i386_fbsd -Y P,/usr/lib/i386} \ %{Wl,*:%*} \ %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ ==== //depot/projects/hammer/contrib/gcc/config/i386/i386.h#5 (text+ko) ==== @@ -35,7 +35,7 @@ that start with ASM_ or end in ASM_OP. */ -/* $FreeBSD: src/contrib/gcc/config/i386/i386.h,v 1.15 2003/02/10 06:05:16 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/i386.h,v 1.16 2003/04/26 20:04:37 obrien Exp $ */ /* Stubs for half-pic support if not OSF/1 reference platform. */ @@ -585,7 +585,7 @@ -D__i386__ %(cpp_cpu32sizet)" #define CPP_CPU64_SPEC \ - "-Acpu=x86_64 -Amachine=x86_64 -D__x86_64 -D__x86_64__ %(cpp_cpu64sizet)" + "-Acpu=x86_64 -Amachine=x86_64 -D__x86_64 -D__x86_64__ %(cpp_cpu64sizet) -D__amd64__ -D__AMD64__" #define CPP_CPUCOMMON_SPEC "\ %{march=i386:%{!mcpu*:-D__tune_i386__ }}\ ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.23 2002/12/02 09:53:59 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.24 2003/04/26 03:28:21 obrien Exp $ .include "../Makefile.inc0" @@ -20,7 +20,9 @@ CLEANFILES+= config.h targmatch.h SELARCH= -.if ${TARGET_ARCH} == "sparc64" +.if ${TARGET_ARCH} == "amd64" +SELARCH= &bfd_i386_arch +.elif ${TARGET_ARCH} == "sparc64" SELARCH= &bfd_sparc_arch .else .for _a in ${ARCHS} ==== //depot/projects/hammer/gnu/usr.bin/cc/Makefile.tgt#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.6 2002/11/06 07:00:59 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.7 2003/04/26 20:04:37 obrien Exp $ TARGET_ARCH?= ${MACHINE_ARCH} @@ -6,7 +6,7 @@ GCC_CPU= alpha .elif ${TARGET_ARCH} == "arm" GCC_CPU= arm -.elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64" +.elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" GCC_CPU= i386 .elif ${TARGET_ARCH} == "ia64" GCC_CPU= ia64 ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.66 2002/10/10 04:56:35 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.67 2003/04/26 20:04:37 obrien Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -148,7 +148,7 @@ .endif echo '#include "ansidecl.h"' >> ${.TARGET} echo '#include "${GCC_CPU}/${GCC_CPU}.h"' >> ${.TARGET} -.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64" +.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" echo '#include "${GCC_CPU}/att.h"' >> ${.TARGET} .endif .if ${TARGET_ARCH} != "alpha" @@ -161,14 +161,14 @@ .if ${TARGET_ARCH} == "alpha" echo '#include "${GCC_CPU}/elf.h"' >> ${.TARGET} .endif -.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "x86_64" +.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h) echo '#include "${GCC_CPU}/sysv4.h"' >> ${.TARGET} .endif .endif echo '#include "${GCC_CPU}/freebsd.h"' >> ${.TARGET} -.if ${TARGET_ARCH} == "x86_64" - echo '#include "${GCC_CPU}/${TARGET_ARCH:S/_/-/}.h"' >> ${.TARGET} +.if ${TARGET_ARCH} == "amd64" + echo '#include "${GCC_CPU}/x86-64.h"' >> ${.TARGET} echo '#include "${GCC_CPU}/freebsd64.h"' >> ${.TARGET} .endif echo '#include "defaults.h"' >> ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/auto-host.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.12 2002/11/26 18:25:18 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.13 2003/04/26 20:04:37 obrien Exp $ */ #include <sys/param.h> @@ -338,7 +338,7 @@ /* #define SIZEOF_LONG 4 */ #if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) #define SIZEOF_LONG SIZEOF_INT -#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__x86_64__) +#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__) #define SIZEOF_LONG SIZEOF_LONG_LONG #else #error "I don't know what arch this is." ==== //depot/projects/hammer/gnu/usr.bin/cc/include/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.4 2003/04/01 12:37:54 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.5 2003/04/26 20:04:38 obrien Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR}/config/${GCC_CPU} -.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64" +.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" INCS= mmintrin.h xmmintrin.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304262155.h3QLtFEi042044>