From 44d15bdc5d5af8196f2b2314dc85978aa70c1bf3 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 18 Nov 2007 07:43:20 +0000 Subject: [PATCH] del not needed git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@311 6952d904-891a-0410-993b-d76249ca496b --- eclass/toolchain-funcs.eclass | 411 ---------------------------------- eclass/toolchain-gcc.eclass | 30 ++- 2 files changed, 29 insertions(+), 412 deletions(-) delete mode 100644 eclass/toolchain-funcs.eclass diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass deleted file mode 100644 index aaf82c9d..00000000 --- a/eclass/toolchain-funcs.eclass +++ /dev/null @@ -1,411 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.74 2007/08/17 10:14:13 vapier Exp $ - -# @ECLASS: toolchain-funcs.eclass -# @MAINTAINER: -# Toolchain Ninjas -# @BLURB: functions to query common info about the toolchain -# @DESCRIPTION: -# The toolchain-funcs aims to provide a complete suite of functions -# for gleaning useful information about the toolchain and to simplify -# ugly things like cross-compiling and multilib. All of this is done -# in such a way that you can rely on the function always returning -# something sane. - -___ECLASS_RECUR_TOOLCHAIN_FUNCS="yes" -[[ -z ${___ECLASS_RECUR_MULTILIB} ]] && inherit multilib - -DESCRIPTION="Based on the ${ECLASS} eclass" - -tc-getPROG() { - local var=$1 - local prog=$2 - - if [[ -n ${!var} ]] ; then - echo "${!var}" - return 0 - fi - - local search= - [[ -n $3 ]] && search=$(type -p "$3-${prog}") - [[ -z ${search} && -n ${CHOST} ]] && search=$(type -p "${CHOST}-${prog}") - [[ -n ${search} ]] && prog=${search##*/} - - export ${var}=${prog} - echo "${!var}" -} - -# @FUNCTION: tc-getAR -# @USAGE: [toolchain prefix] -# @RETURN: name of the archiver -tc-getAR() { tc-getPROG AR ar "$@"; } -# @FUNCTION: tc-getAS -# @USAGE: [toolchain prefix] -# @RETURN: name of the assembler -tc-getAS() { tc-getPROG AS as "$@"; } -# @FUNCTION: tc-getCC -# @USAGE: [toolchain prefix] -# @RETURN: name of the C compiler -tc-getCC() { tc-getPROG CC gcc "$@"; } -# @FUNCTION: tc-getCPP -# @USAGE: [toolchain prefix] -# @RETURN: name of the C preprocessor -tc-getCPP() { tc-getPROG CPP cpp "$@"; } -# @FUNCTION: tc-getCXX -# @USAGE: [toolchain prefix] -# @RETURN: name of the C++ compiler -tc-getCXX() { tc-getPROG CXX g++ "$@"; } -# @FUNCTION: tc-getLD -# @USAGE: [toolchain prefix] -# @RETURN: name of the linker -tc-getLD() { tc-getPROG LD ld "$@"; } -# @FUNCTION: tc-getSTRIP -# @USAGE: [toolchain prefix] -# @RETURN: name of the strip program -tc-getSTRIP() { tc-getPROG STRIP strip "$@"; } -# @FUNCTION: tc-getNM -# @USAGE: [toolchain prefix] -# @RETURN: name of the symbol/object thingy -tc-getNM() { tc-getPROG NM nm "$@"; } -# @FUNCTION: tc-getRANLIB -# @USAGE: [toolchain prefix] -# @RETURN: name of the archiver indexer -tc-getRANLIB() { tc-getPROG RANLIB ranlib "$@"; } -# @FUNCTION: tc-getF77 -# @USAGE: [toolchain prefix] -# @RETURN: name of the Fortran 77 compiler -tc-getF77() { tc-getPROG F77 f77 "$@"; } -# @FUNCTION: tc-getF90 -# @USAGE: [toolchain prefix] -# @RETURN: name of the Fortran 90 compiler -tc-getF90() { tc-getPROG F90 gfortran "$@"; } -# @FUNCTION: tc-getFORTRAN -# @USAGE: [toolchain prefix] -# @RETURN: name of the Fortran compiler -tc-getFORTRAN() { tc-getPROG FORTRAN gfortran "$@"; } -# @FUNCTION: tc-getGCJ -# @USAGE: [toolchain prefix] -# @RETURN: name of the java compiler -tc-getGCJ() { tc-getPROG GCJ gcj "$@"; } - -# @FUNCTION: tc-getBUILD_CC -# @USAGE: [toolchain prefix] -# @RETURN: name of the C compiler for building binaries to run on the build machine -tc-getBUILD_CC() { - local v - for v in CC_FOR_BUILD BUILD_CC HOSTCC ; do - if [[ -n ${!v} ]] ; then - export BUILD_CC=${!v} - echo "${!v}" - return 0 - fi - done - - local search= - if [[ -n ${CBUILD} ]] ; then - search=$(type -p ${CBUILD}-gcc) - search=${search##*/} - fi - search=${search:-gcc} - - export BUILD_CC=${search} - echo "${search}" -} - -# @FUNCTION: tc-export -# @USAGE: -# @DESCRIPTION: -# Quick way to export a bunch of compiler vars at once. -tc-export() { - local var - for var in "$@" ; do - eval tc-get${var} > /dev/null - done -} - -# @FUNCTION: tc-is-cross-compiler -# @RETURN: Shell true if we are using a cross-compiler, shell false otherwise -tc-is-cross-compiler() { - return $([[ ${CBUILD:-${CHOST}} != ${CHOST} ]]) -} - -# @FUNCTION: tc-is-softfloat -# @DESCRIPTION: -# See if this toolchain is a softfloat based one. -# @CODE -# The possible return values: -# - only: the target is always softfloat (never had fpu) -# - yes: the target should support softfloat -# - no: the target should support hardfloat -# @CODE -# This allows us to react differently where packages accept -# softfloat flags in the case where support is optional, but -# rejects softfloat flags where the target always lacks an fpu. -tc-is-softfloat() { - case ${CTARGET} in - bfin*|h8300*) - echo "only" ;; - *) - [[ ${CTARGET//_/-} == *-softfloat-* ]] \ - && echo "yes" \ - || echo "no" - ;; - esac -} - -# Parse information from CBUILD/CHOST/CTARGET rather than -# use external variables from the profile. -tc-ninja_magic_to_arch() { -ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } - - local type=$1 - local host=$2 - [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} - - case ${host} in - alpha*) echo alpha;; - arm*) echo arm;; - avr*) ninj avr32 avr;; - bfin*) ninj blackfin bfin;; - cris*) echo cris;; - hppa*) ninj parisc hppa;; - i?86*) ninj i386 x86;; - ia64*) echo ia64;; - m68*) echo m68k;; - mips*) echo mips;; - nios2*) echo nios2;; - nios*) echo nios;; - powerpc*) - # Starting with linux-2.6.15, the 'ppc' and 'ppc64' trees - # have been unified into simply 'powerpc', but until 2.6.16, - # ppc32 is still using ARCH="ppc" as default - if [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.16) ]] && [[ ${type} == "kern" ]] ; then - echo powerpc - elif [[ $(KV_to_int ${KV}) -eq $(KV_to_int 2.6.15) ]] && [[ ${type} == "kern" ]] ; then - if [[ ${host} == powerpc64* ]] || [[ ${PROFILE_ARCH} == "ppc64" ]] ; then - echo powerpc - else - echo ppc - fi - elif [[ ${host} == powerpc64* ]] ; then - echo ppc64 - elif [[ ${PROFILE_ARCH} == "ppc64" ]] ; then - ninj ppc64 ppc - else - echo ppc - fi - ;; - s390*) echo s390;; - sh64*) ninj sh64 sh;; - sh*) echo sh;; - sparc64*) ninj sparc64 sparc;; - sparc*) [[ ${PROFILE_ARCH} == "sparc64" ]] \ - && ninj sparc64 sparc \ - || echo sparc - ;; - vax*) echo vax;; - x86_64*) ninj x86_64 amd64;; - - # since our usage of tc-arch is largely concerned with - # normalizing inputs for testing ${CTARGET}, let's filter - # other cross targets (mingw and such) into the unknown. - *) echo unknown;; - esac -} -# @FUNCTION: tc-arch-kernel -# @USAGE: [toolchain prefix] -# @RETURN: name of the kernel arch according to the compiler target -tc-arch-kernel() { - tc-ninja_magic_to_arch kern "$@" -} -# @FUNCTION: tc-arch -# @USAGE: [toolchain prefix] -# @RETURN: name of the portage arch according to the compiler target -tc-arch() { - tc-ninja_magic_to_arch portage "$@" -} - -tc-endian() { - local host=$1 - [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} - host=${host%%-*} - - case ${host} in - alpha*) echo big;; - arm*b*) echo big;; - arm*) echo little;; - cris*) echo little;; - hppa*) echo big;; - i?86*) echo little;; - ia64*) echo little;; - m68*) echo big;; - mips*l*) echo little;; - mips*) echo big;; - powerpc*) echo big;; - s390*) echo big;; - sh*b*) echo big;; - sh*) echo little;; - sparc*) echo big;; - x86_64*) echo little;; - *) echo wtf;; - esac -} - -# @FUNCTION: gcc-fullversion -# @RETURN: compiler version (major.minor.micro: [3.4.6]) -gcc-fullversion() { - $(tc-getCC "$@") -dumpversion -} -# @FUNCTION: gcc-version -# @RETURN: compiler version (major.minor: [3.4].6) -gcc-version() { - gcc-fullversion "$@" | cut -f1,2 -d. -} -# @FUNCTION: gcc-major-version -# @RETURN: major compiler version (major: [3].4.6) -gcc-major-version() { - gcc-version "$@" | cut -f1 -d. -} -# @FUNCTION: gcc-minor-version -# @RETURN: minor compiler version (minor: 3.[4].6) -gcc-minor-version() { - gcc-version "$@" | cut -f2 -d. -} -# @FUNCTION: gcc-micro-version -# @RETURN: micro compiler version (micro: 3.4.[6]) -gcc-micro-version() { - gcc-fullversion "$@" | cut -f3 -d. | cut -f1 -d- -} - -# Returns the installation directory - internal toolchain -# function for use by _gcc-specs-exists (for flag-o-matic). -_gcc-install-dir() { - echo "$($(tc-getCC) -print-search-dirs 2> /dev/null |\ - awk '$1=="install:" {print $2}')" -} -# Returns true if the indicated specs file exists - internal toolchain -# function for use by flag-o-matic. -_gcc-specs-exists() { - [[ -f $(_gcc-install-dir)/$1 ]] -} - -# Returns requested gcc specs directive unprocessed - for used by -# gcc-specs-directive() -# Note; later specs normally overwrite earlier ones; however if a later -# spec starts with '+' then it appends. -# gcc -dumpspecs is parsed first, followed by files listed by "gcc -v" -# as "Reading ", in order. Strictly speaking, if there's a -# $(gcc_install_dir)/specs, the built-in specs aren't read, however by -# the same token anything from 'gcc -dumpspecs' is overridden by -# the contents of $(gcc_install_dir)/specs so the result is the -# same either way. -_gcc-specs-directive_raw() { - local cc=$(tc-getCC) - local specfiles=$(LC_ALL=C ${cc} -v 2>&1 | awk '$1=="Reading" {print $NF}') - ${cc} -dumpspecs 2> /dev/null | cat - ${specfiles} | awk -v directive=$1 \ -'BEGIN { pspec=""; spec=""; outside=1 } -$1=="*"directive":" { pspec=spec; spec=""; outside=0; next } - outside || NF==0 || ( substr($1,1,1)=="*" && substr($1,length($1),1)==":" ) { outside=1; next } - spec=="" && substr($0,1,1)=="+" { spec=pspec " " substr($0,2); next } - { spec=spec $0 } -END { print spec }' - return 0 -} - -# Return the requested gcc specs directive, with all included -# specs expanded. -# Note, it does not check for inclusion loops, which cause it -# to never finish - but such loops are invalid for gcc and we're -# assuming gcc is operational. -gcc-specs-directive() { - local directive subdname subdirective - directive="$(_gcc-specs-directive_raw $1)" - while [[ ${directive} == *%\(*\)* ]]; do - subdname=${directive/*%\(} - subdname=${subdname/\)*} - subdirective="$(_gcc-specs-directive_raw ${subdname})" - directive="${directive//\%(${subdname})/${subdirective}}" - done - echo "${directive}" - return 0 -} - -# Returns true if gcc sets relro -gcc-specs-relro() { - local directive - directive=$(gcc-specs-directive link_command) - return $([[ ${directive/\{!norelro:} != ${directive} ]]) -} -# Returns true if gcc sets now -gcc-specs-now() { - local directive - directive=$(gcc-specs-directive link_command) - return $([[ ${directive/\{!nonow:} != ${directive} ]]) -} -# Returns true if gcc builds PIEs -gcc-specs-pie() { - local directive - directive=$(gcc-specs-directive cc1) - return $([[ ${directive/\{!nopie:} != ${directive} ]]) -} -# Returns true if gcc builds with the stack protector -gcc-specs-ssp() { - local directive - directive=$(gcc-specs-directive cc1) - return $([[ ${directive/\{!fno-stack-protector:} != ${directive} ]]) -} -# Returns true if gcc upgrades fstack-protector to fstack-protector-all -gcc-specs-ssp-to-all() { - local directive - directive=$(gcc-specs-directive cc1) - return $([[ ${directive/\{!fno-stack-protector-all:} != ${directive} ]]) -} - - -# @FUNCTION: gen_usr_ldscript -# @USAGE: -# @DESCRIPTION: -# This function generate linker scripts in /usr/lib for dynamic -# libs in /lib. This is to fix linking problems when you have -# the .so in /lib, and the .a in /usr/lib. What happens is that -# in some cases when linking dynamic, the .a in /usr/lib is used -# instead of the .so in /lib due to gcc/libtool tweaking ld's -# library search path. This causes many builds to fail. -# See bug #4411 for more info. -# -# Note that you should in general use the unversioned name of -# the library (libfoo.so), as ldconfig should usually update it -# correctly to point to the latest version of the library present. -gen_usr_ldscript() { - local lib libdir=$(get_libdir) output_format="" - # Just make sure it exists - dodir /usr/${libdir} - - # OUTPUT_FORMAT gives hints to the linker as to what binary format - # is referenced ... makes multilib saner - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" - - for lib in "$@" ; do - if [[ ${USERLAND} == "Darwin" ]] ; then - ewarn "Not creating fake dynamic library for $lib on Darwin;" - ewarn "making a symlink instead." - dosym "/${libdir}/${lib}" "/usr/${libdir}/${lib}" - else - cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT - /* GNU ld script - Since Gentoo has critical dynamic libraries - in /lib, and the static versions in /usr/lib, - we need to have a "fake" dynamic lib in /usr/lib, - otherwise we run into linking problems. - - See bug http://bugs.gentoo.org/4411 for more info. - */ - ${output_format} - GROUP ( /${libdir}/${lib} ) - END_LDSCRIPT - fi - fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}" - done -} diff --git a/eclass/toolchain-gcc.eclass b/eclass/toolchain-gcc.eclass index 755b2728..918e2f14 100644 --- a/eclass/toolchain-gcc.eclass +++ b/eclass/toolchain-gcc.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.342 2007/11/12 19:33:00 vapier Exp $ +# $Header: $ # # Maintainer: Toolchain Ninjas @@ -259,6 +259,13 @@ gcc_get_s_dir() { # for an older gcc version with a new gcc, make sure you set # HTB_GCC_VER to that version of gcc. # +# LLVM_VER +# LLVM_GCC_VER +# These variables control whether or not an ebuild supports +# The LLVM Compiler Infrastructure patches. If you want to use a patch +# for an older gcc version with a new gcc, make sure you set +# LLVM_GCC_VER to that version of gcc. +# # MAN_VER # The version of gcc for which we will download manpages. This will # default to ${GCC_RELEASE_VER}, but we may not want to pre-generate man pages @@ -279,6 +286,7 @@ get_gcc_src_uri() { export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}} export PP_GCC_VER=${PP_GCC_VER:-${GCC_RELEASE_VER}} export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}} + export LLVM_GCC_VER=${LLVM_GCC_VER:-${GCC_RELEASE_VER}} [[ -n ${PIE_VER} ]] && \ PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} @@ -336,6 +344,15 @@ get_gcc_src_uri() { )" fi + # gcc llvm patch + if [[ -n ${LLVM_VER} ]] ; then + local LLVMFILE="gcc-${LLVM_GCC_VER}-llvm${LLVM_VER}.patch.bz2" + GCC_SRC_URI="${GCC_SRC_URI} + llvm? ( + http://ftp.mars.arge.at/pub/${LLVMFILE} + )" + fi + # support for the D language [[ -n ${D_VER} ]] && \ GCC_SRC_URI="${GCC_SRC_URI} d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )" @@ -468,6 +485,7 @@ _want_stuff() { return 1 } want_boundschecking() { _want_stuff HTB_VER boundschecking ; } +want_llvm() { _want_stuff LLVM_VER Low Level Virtual Machine ; } want_pie() { _want_stuff PIE_VER !nopie ; } want_ssp() { _want_stuff PP_VER !nossp ; } @@ -1024,6 +1042,7 @@ gcc_src_unpack() { epatch "${WORKDIR}"/uclibc fi fi + do_gcc_LLVM_patches do_gcc_HTB_patches do_gcc_SSP_patches do_gcc_PIE_patches @@ -1845,6 +1864,7 @@ gcc_quick_unpack() { export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}} export PP_GCC_VER=${PP_GCC_VER:-${GCC_RELEASE_VER}} export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}} + export LLVM_GCC_VER=${LLVM_GCC_VER:-${GCC_RELEASE_VER}} if [[ -n ${GCC_A_FAKEIT} ]] ; then unpack ${GCC_A_FAKEIT} @@ -1905,6 +1925,9 @@ gcc_quick_unpack() { want_boundschecking && \ unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2" + want_llvm && \ + unpack "gcc-${LLVM_GCC_VER}-llvm${LLVM_VER}.patch.bz2" + popd > /dev/null } @@ -1961,6 +1984,11 @@ do_gcc_HTB_patches() { release_version="${release_version}, HTB-${HTB_GCC_VER}-${HTB_VER}" } +do_gcc_LLVM_patches() { + epatch "${WORKDIR}/gcc-${LLVM_GCC_VER}-llvm${LLVM_VER}.patch" + release_version="${release_version}, LLVM-${LLVM_GCC_VER}-${LLVM_VER}" +} + # patch in ProPolice Stack Smashing protection do_gcc_SSP_patches() { # PARISC has no love ... it's our stack :(