Bump to version from Developer Tools 4.2

(Portage version: 2.2.01.19572-prefix/cvs/Darwin i386)

6 files changed, 587 insertions, 4 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 18a97d315046..5cd5c876b93f 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-devel/binutils-apple
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.23 2011/10/19 06:45:18 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.24 2011/11/05 16:30:56 grobian Exp $
 
   19 Oct 2011; Fabian Groffen <grobian@gentoo.org> files/ld64-123.2-Makefile:
   Fix compilation of ld64, add back wrongly dropped LD64LIBS, thanks Charles
diff --git a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
index e8d5fae2d980..ddb16191060d 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 2010-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.1.ebuild,v 1.4 2011/09/25 09:32:15 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.1.ebuild,v 1.5 2011/11/05 16:30:56 grobian Exp $
 
 EAPI="3"
 
diff --git a/sys-devel/binutils-apple/binutils-apple-4.2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.2.ebuild
new file mode 100644
index 000000000000..5cd37f03556a
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-4.2.ebuild
@@ -0,0 +1,290 @@
+# Copyright 2010-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2.ebuild,v 1.1 2011/11/05 16:30:56 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+RESTRICT="test" # the test suite will test what's installed.
+
+LD64=ld64-127.2
+CCTOOLS=cctools-809
+LIBUNWIND=libunwind-30
+DYLD=dyld-195.5
+# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
+UNWIND=binutils-apple-3.2-unwind-patches-5
+
+DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
+HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
+SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
+	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
+	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
+	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
+	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz
+	http://www.gentoo.org/~grobian/distfiles/libunwind-llvm-115426.tar.bz2"
+
+LICENSE="APSL-2"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE="lto test"
+
+RDEPEND="sys-devel/binutils-config
+	lto? ( sys-devel/llvm )
+	test? ( >=dev-lang/perl-5.8.8 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-apple-4.2.1"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+if is_cross ; then
+	SLOT="${CTARGET}-4"
+else
+	SLOT="4"
+fi
+
+LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+INCPATH=${LIBPATH}/include
+DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+if is_cross ; then
+	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+else
+	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+fi
+
+S=${WORKDIR}
+
+src_prepare() {
+	cd "${S}"/${LIBUNWIND}/src
+	cp "${FILESDIR}"/${LIBUNWIND}-Makefile Makefile
+
+	cd "${S}"/${LD64}/src
+	cp "${FILESDIR}"/ld64-123.2-Makefile Makefile
+	epatch "${FILESDIR}"/${LD64}-lto.patch
+
+	ln -s ../../${CCTOOLS}/include
+	cp other/prune_trie.h include/mach-o/ || die
+	# use our own copy of lto.h, which doesn't require llvm build-env
+	mkdir -p include/llvm-c || die
+	cp "${WORKDIR}"/ld64-unwind/ld64-97.14-llvm-lto.h include/llvm-c/lto.h || die
+	# make libunwind sources known
+	ln -s ../../${LIBUNWIND}/src libunwind || die
+	cp ../../${LIBUNWIND}/include/*.h include/ || die
+	# mimic OS X Lion-style Availability.h macros
+	if [[ ${CHOST#*-darwin} -le 10 ]] ; then
+		{
+			echo "#define __OSX_AVAILABLE_STARTING(x,y)  "
+			echo "#define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d)  "
+		} > include/Availability.h
+	fi
+
+	echo '' > configure.h
+	echo '' > linker_opts
+	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
+	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
+
+	epatch "${FILESDIR}"/ld64-123.2-debug-backtrace.patch
+	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
+		epatch "${FILESDIR}"/ld64-123.2.1-darwin8-no-mlong-branch-warning.patch
+		sed -i -e '/#include <mach-o\/loader.h>/a\#include <mach/i386/thread_status.h>' \
+			ld/HeaderAndLoadCommands.hpp || die
+	fi
+	if use !lto ; then
+		sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die
+	fi
+
+	cd "${S}"/${CCTOOLS}
+	epatch "${FILESDIR}"/${PN}-4.0-as.patch
+	epatch "${FILESDIR}"/${PN}-4.2-as-dir.patch
+	epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
+	epatch "${FILESDIR}"/${PN}-4.0-no-oss-dir.patch
+	epatch "${FILESDIR}"/${PN}-4.2-lto.patch
+
+	# clean up test suite
+	cd "${S}"/${LD64}
+#	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
+
+	cd "${S}"/${LD64}/unit-tests/test-cases
+	local c
+
+	# we don't have llvm
+	((++c)); rm -rf llvm-integration;
+
+	# we don't have dtrace
+	((++c)); rm -rf dtrace-static-probes-coalescing;
+	((++c)); rm -rf dtrace-static-probes;
+
+	# a file is missing
+	((++c)); rm -rf eh-coalescing-r
+
+	# we don't do universal binaries
+	((++c)); rm -rf blank-stubs;
+
+	# looks like a problem with apple's result-filter.pl
+	((++c)); rm -rf implicit-common3;
+	((++c)); rm -rf order_file-ans;
+
+	# TODO no idea what goes wrong here
+	((++c)); rm -rf dwarf-debug-notes;
+
+	einfo "Deleted $c tests that were bound to fail"
+
+	cd "${S}"
+	ebegin "cleaning Makefiles from unwanted CFLAGS"
+	find . -name "Makefile" -print0 | xargs -0 sed \
+		-i \
+		-e 's/ -g / /g' \
+		-e 's/^OFLAG =.*$/OFLAG =/' \
+		-e 's/install -c -s/install/g'
+	eend $?
+
+	# -pg is used and the two are incompatible
+	filter-flags -fomit-frame-pointer
+}
+
+src_configure() {
+	tc-export CC CXX AR
+	if use lto ; then
+		append-flags -DLTO_SUPPORT
+		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/llvm
+		append-libs LTO
+		LTO=1
+	else
+		append-flags -ULTO_SUPPORT
+		LTO=0
+	fi
+	append-flags -DNDEBUG
+	append-flags -I${WORKDIR}/libunwind/include
+}
+
+compile_libunwind() {
+	# not used, just for testing, and possible use in the future
+	einfo "building ${LIBUNWIND}"
+	cd "${S}"/${LIBUNWIND}/src
+	emake DYLDINCS=-I../../${DYLD}/include || die
+}
+
+compile_ld64() {
+	einfo "building ${LD64}"
+	cd "${S}"/${LD64}/src
+	# remove antiquated copy that's available on any OSX system and
+	# breaks ld64 compilation
+	mv include/mach-o/dyld.h{,.disable}
+	emake \
+		LTO=${LTO} \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS} -I../../${DYLD}/include" \
+		LDFLAGS="${LDFLAGS} ${LIBS}" \
+		|| die "emake failed for ld64"
+	use test && emake build_test
+	# restore, it's necessary for cctools' install
+	mv include/mach-o/dyld.h{.disable,}
+}
+
+compile_cctools() {
+	einfo "building ${CCTOOLS}"
+	cd "${S}"/${CCTOOLS}
+	emake \
+		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
+		EFITOOLS= LTO= \
+		COMMON_SUBDIRS='libstuff ar misc otool' \
+		SUBDIRS_32= \
+		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
+		|| die "emake failed for the cctools"
+	cd "${S}"/${CCTOOLS}/as
+	emake \
+		BUILD_OBSOLETE_ARCH= \
+		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
+		|| die "emake failed for as"
+}
+
+src_compile() {
+	compile_ld64
+	compile_cctools
+}
+
+install_ld64() {
+	exeinto ${BINPATH}
+	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
+	dosym ld64 ${BINPATH}/ld
+	insinto ${DATAPATH}/man/man1
+	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
+}
+
+install_cctools() {
+	cd "${S}"/${CCTOOLS}
+	emake install_all_but_headers \
+		EFITOOLS= LTO= \
+		COMMON_SUBDIRS='ar misc otool' \
+		SUBDIRS_32= \
+		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
+		DSTROOT=\"${D}\" \
+		BINDIR=\"${EPREFIX}\"${BINPATH} \
+		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
+		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
+		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
+		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
+	cd "${S}"/${CCTOOLS}/as
+	emake install \
+		BUILD_OBSOLETE_ARCH= \
+		DSTROOT=\"${D}\" \
+		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
+		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
+		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
+
+	cd "${ED}"${BINPATH}
+	insinto ${DATAPATH}/man/man1
+	local skips manpage
+	# ar brings an up-to-date manpage with it
+	skips=( ar )
+	for bin in *; do
+		for skip in ${skips[@]}; do
+			if [[ ${bin} == ${skip} ]]; then
+				continue 2;
+			fi
+		done
+		manpage=${S}/${CCTOOLS}/man/${bin}.1
+		if [[ -f "${manpage}" ]]; then
+			doins "${manpage}"
+		fi
+	done
+	insinto ${DATAPATH}/man/man5
+	doins "${S}"/${CCTOOLS}/man/*.5
+}
+
+src_test() {
+	einfo "Running unit tests"
+	cd "${S}"/${LD64}/unit-tests/test-cases
+	# need host arch, since GNU arch doesn't do what Apple's does
+	tc-export CC CXX
+	perl ../bin/make-recursive.pl \
+		ARCH="$(/usr/bin/arch)" \
+		RELEASEDIR="${S}"/${LD64}/src \
+		| perl ../bin/result-filter.pl
+}
+
+src_install() {
+	install_ld64
+	install_cctools
+
+	cd "${S}"
+	insinto /etc/env.d/binutils
+	cat <<-EOF > env.d
+		TARGET="${CHOST}"
+		VER="${PV}"
+		FAKE_TARGETS="${CHOST}"
+	EOF
+	newins env.d ${CHOST}-${PV}
+}
+
+pkg_postinst() {
+	binutils-config ${CHOST}-${PV}
+}
diff --git a/sys-devel/binutils-apple/files/binutils-apple-4.2-as-dir.patch b/sys-devel/binutils-apple/files/binutils-apple-4.2-as-dir.patch
new file mode 100644
index 000000000000..b3047f6215fd
--- /dev/null
+++ b/sys-devel/binutils-apple/files/binutils-apple-4.2-as-dir.patch
@@ -0,0 +1,45 @@
+--- as/driver.c
++++ as/driver.c
+@@ -230,7 +230,11 @@
+ 	/*
+ 	 * If this assembler exist try to run it else print an error message.
+ 	 */
++#ifndef ASLIBEXECDIR
+ 	as = makestr(prefix, LIB, arch_name, AS, NULL);
++#else
++	as = makestr(ASLIBEXECDIR, arch_name, AS, NULL);
++#endif
+ 	if(access(as, F_OK) == 0){
+ 	    argv[0] = as;
+ 	    if(execute(argv, verbose))
+@@ -238,6 +242,9 @@
+ 	    else
+ 		exit(1);
+ 	}
++#ifdef ASLIBEXECDIR
++    as_local = "";
++#else
+ 	as_local = makestr(prefix, LOCALLIB, arch_name, AS, NULL);
+ 	if(access(as_local, F_OK) == 0){
+ 	    argv[0] = as_local;
+@@ -246,10 +253,12 @@
+ 	    else
+ 		exit(1);
+ 	}
++#endif
+ 	printf("%s: assembler (%s or %s) for architecture %s not installed\n",
+ 	       progname, as, as_local, arch_name);
+ 	arch_flags = get_arch_flags();
+ 	count = 0;
++#ifndef ASLIBEXECDIR
+ 	for(i = 0; arch_flags[i].name != NULL; i++){
+ 	    as = makestr(prefix, LIB, arch_flags[i].name, AS, NULL);
+ 	    if(access(as, F_OK) == 0){
+@@ -270,6 +279,7 @@
+ 		}
+ 	    }
+ 	}
++#endif
+ 	if(count == 0)
+ 	    printf("%s: no assemblers installed\n", progname);
+ 	exit(1);
diff --git a/sys-devel/binutils-apple/files/binutils-apple-4.2-lto.patch b/sys-devel/binutils-apple/files/binutils-apple-4.2-lto.patch
new file mode 100644
index 000000000000..791a922dd425
--- /dev/null
+++ b/sys-devel/binutils-apple/files/binutils-apple-4.2-lto.patch
@@ -0,0 +1,34 @@
+--- misc/lipo.c
++++ misc/lipo.c
+@@ -1191,6 +1191,7 @@
+ 		thin->fat_arch.align = 0;
+ 	    }
+ 	    else{
++#ifdef LTO_SUPPORT
+ 		if(is_llvm_bitcode_from_memory(addr, size, &input->arch_flag,
+ 					       NULL) != 0){
+ 		    /* create a thin file struct for it */
+@@ -1204,6 +1205,7 @@
+ 		    thin->fat_arch.align = 0;
+ 		}
+ 		else
++#endif
+ 		    fatal("can't figure out the architecture type of: %s",
+ 			  input->name);
+ 	    }
+@@ -1444,6 +1446,7 @@
+ 		    if(strncmp(ar_name, SYMDEF, sizeof(SYMDEF) - 1) != 0){
+ 			ar_addr = addr + offset + ar_name_size;
+ 			ar_size = strtoul(ar_hdr->ar_size, NULL, 10);
++#ifdef LTO_SUPPORT
+ 			if(is_llvm_bitcode_from_memory(ar_addr, ar_size,
+ 						       &arch_flag, NULL) != 0){
+ 			    if(*cputype == 0){
+@@ -1466,6 +1464,7 @@
+ 				      (*cpusubtype) & ~CPU_SUBTYPE_MASK);
+ 			    }
+ 			}
++#endif
+ 		    }
+ 		}
+ 	    } 
diff --git a/sys-devel/binutils-apple/files/ld64-127.2-lto.patch b/sys-devel/binutils-apple/files/ld64-127.2-lto.patch
new file mode 100644
index 000000000000..b9a3f14042c5
--- /dev/null
+++ b/sys-devel/binutils-apple/files/ld64-127.2-lto.patch
@@ -0,0 +1,214 @@
+--- src/ld/InputFiles.cpp
++++ src/ld/InputFiles.cpp
+@@ -58,7 +58,9 @@
+ #include "macho_relocatable_file.h"
+ #include "macho_dylib_file.h"
+ #include "archive_file.h"
++#ifdef LTO
+ #include "lto_file.h"
++#endif
+ #include "opaque_section_file.h"
+ 
+ 
+@@ -175,9 +177,11 @@
+ 	if ( result != NULL  )
+ 		 return result;
+ 		 
++#ifdef LTO
+ 	result = lto::archName(p, len);
+ 	if ( result != NULL  )
+ 		 return result;
++#endif
+ 	
+ 	if ( strncmp((const char*)p, "!<arch>\n", 8) == 0 )
+ 		return "archive";
+@@ -264,10 +268,12 @@
+ 	if ( objResult != NULL ) 
+ 		return this->addObject(objResult, info, len);
+ 
++#if LTO
+ 	// see if it is an llvm object file
+ 	objResult = lto::parse(p, len, info.path, info.modTime, _nextInputOrdinal, _options.architecture(), _options.subArchitecture(), _options.logAllFiles());
+ 	if ( objResult != NULL ) 
+ 		return this->addObject(objResult, info, len);
++#endif
+ 
+ 	// see if it is a dynamic library
+ 	ld::dylib::File* dylibResult = mach_o::dylib::parse(p, len, info.path, info.modTime, _options, _nextInputOrdinal, info.options.fBundleLoader, indirectDylib);
+@@ -291,6 +297,7 @@
+ 		return this->addArchive(archiveResult, info, len);
+ 	}
+ 	
++#ifdef LTO
+ 	// does not seem to be any valid linker input file, check LTO misconfiguration problems
+ 	if ( lto::archName((uint8_t*)p, len) != NULL ) {
+ 		if ( lto::libLTOisLoaded() ) {
+@@ -315,6 +322,7 @@
+ 			throwf("could not process llvm bitcode object file, because %s could not be loaded", libLTO);
+ 		}
+ 	}
++#endif
+ 
+ 	// error handling
+ 	if ( ((fat_header*)p)->magic == OSSwapBigToHostInt32(FAT_MAGIC) ) {
+--- src/ld/Options.cpp
++++ src/ld/Options.cpp
+@@ -36,10 +36,12 @@
+ #include "Architectures.hpp"
+ #include "MachOFileAbstraction.hpp"
+ 
++#ifdef LTO
+ // upward dependency on lto::version()
+ namespace lto {
+ 	extern const char* version();
+ }
++#endif
+ 
+ // magic to place command line in crash reports
+ const int crashreporterBufferSize = 2000;
+@@ -2766,9 +2768,11 @@
+ 			fprintf(stderr, "%s", ldVersionString);
+ 			 // if only -v specified, exit cleanly
+ 			 if ( argc == 2 ) {
++#ifdef LTO
+ 				const char* ltoVers = lto::version();
+ 				if ( ltoVers != NULL )
+ 					fprintf(stderr, "%s\n", ltoVers);
++#endif
+ 				exit(0);
+ 			}
+ 		}
+--- src/ld/Resolver.cpp
++++ src/ld/Resolver.cpp
+@@ -58,7 +58,9 @@
+ #include "InputFiles.h"
+ #include "SymbolTable.h"
+ #include "Resolver.h"
++#ifdef LTO
+ #include "parsers/lto_file.h"
++#endif
+ 
+ 
+ namespace ld {
+@@ -1315,6 +1317,7 @@
+ 
+ void Resolver::linkTimeOptimize()
+ {
++#ifdef LTO
+ 	// only do work here if some llvm obj files where loaded
+ 	if ( ! _haveLLVMObjs )
+ 		return;
+@@ -1415,6 +1418,9 @@
+ 		// check new code does not override some dylib
+ 		this->checkDylibSymbolCollisions();
+ 	}
++#else
++	return;
++#endif
+ }
+ 
+ 
+--- src/ld/ld.cpp
++++ src/ld/ld.cpp
+@@ -83,7 +83,9 @@
+ #include "parsers/archive_file.h"
+ #include "parsers/macho_relocatable_file.h"
+ #include "parsers/macho_dylib_file.h"
++#ifdef LTO
+ #include "parsers/lto_file.h"
++#endif
+ #include "parsers/opaque_section_file.h"
+ 
+ 
+--- src/ld/parsers/archive_file.cpp
++++ src/ld/parsers/archive_file.cpp
+@@ -39,7 +39,9 @@
+ #include "Architectures.hpp"
+ 
+ #include "macho_relocatable_file.h"
++#ifdef LTO
+ #include "lto_file.h"
++#endif
+ #include "archive_file.h"
+ 
+ 
+@@ -91,8 +93,10 @@
+ private:
+ 	static bool										validMachOFile(const uint8_t* fileContent, uint64_t fileLength, 
+ 																	const mach_o::relocatable::ParserOptions& opts);
++#ifdef LTO
+ 	static bool										validLTOFile(const uint8_t* fileContent, uint64_t fileLength, 
+ 																	const mach_o::relocatable::ParserOptions& opts);
++#endif
+ 	static cpu_type_t								architecture();
+ 
+ 	class Entry : ar_hdr
+@@ -239,12 +243,13 @@
+ 	return mach_o::relocatable::isObjectFile(fileContent, fileLength, opts);
+ }
+ 
++#ifdef LTO
+ template <typename A>
+ bool File<A>::validLTOFile(const uint8_t* fileContent, uint64_t fileLength, const mach_o::relocatable::ParserOptions& opts)
+ {
+ 	return lto::isObjectFile(fileContent, fileLength, opts.architecture, opts.subType);
+ }
+-
++#endif
+ 
+ 
+ template <typename A>
+@@ -263,7 +268,11 @@
+ 		if ( (p==start) && ((strcmp(memberName, SYMDEF_SORTED) == 0) || (strcmp(memberName, SYMDEF) == 0)) )
+ 			continue;
+ 		// archive is valid if first .o file is valid
+-		return (validMachOFile(p->content(), p->contentSize(), opts) || validLTOFile(p->content(), p->contentSize(), opts));
++		return (validMachOFile(p->content(), p->contentSize(), opts)
++#ifdef LTO
++				|| validLTOFile(p->content(), p->contentSize(), opts)
++#endif
++				);
+ 	}	
+ 	// empty archive
+ 	return true;
+@@ -363,6 +372,7 @@
+ 			_instantiatedEntries[member] = state;
+ 			return _instantiatedEntries[member];
+ 		}
++#ifdef LTO
+ 		// see if member is llvm bitcode file
+ 		result = lto::parse(member->content(), member->contentSize(), 
+ 								mPath, member->modificationTime(), this->ordinal() + memberIndex, 
+@@ -372,6 +382,7 @@
+ 			_instantiatedEntries[member] = state;
+ 			return _instantiatedEntries[member];
+ 		}
++#endif
+ 			
+ 		throwf("archive member '%s' with length %d is not mach-o or llvm bitcode", memberName, member->contentSize());
+ 	}
+--- src/other/ObjectDump.cpp
++++ src/other/ObjectDump.cpp
+@@ -33,7 +33,9 @@
+ 
+ #include "MachOFileAbstraction.hpp"
+ #include "parsers/macho_relocatable_file.h"
++#ifdef LTO
+ #include "parsers/lto_file.h"
++#endif
+ 
+ static bool			sDumpContent= true;
+ static bool			sDumpStabs	= false;
+@@ -1150,10 +1152,12 @@
+ 	if ( objResult != NULL )
+ 		return objResult;
+ 
++#ifdef LTO
+ 	// see if it is an llvm object file
+ 	objResult = lto::parse(p, fileLen, path, stat_buf.st_mtime, 0, sPreferredArch, sPreferredSubArch, false);
+ 	if ( objResult != NULL ) 
+ 		return objResult;
++#endif
+ 
+ 	throwf("not a mach-o object file: %s", path);
+ #else