1 --- llvm-3.4.1.src/autoconf/configure.ac.orig 2014-05-21 18:37:05.321379360 +0200
2 +++ llvm-3.4.1.src/autoconf/configure.ac 2014-05-21 18:40:49.568041358 +0200
4 eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
5 eval LLVM_ETCDIR="${prefix}/etc/llvm";
6 eval LLVM_INCLUDEDIR="${prefix}/include";
7 -eval LLVM_INFODIR="${prefix}/info";
8 -eval LLVM_MANDIR="${prefix}/man";
9 +eval LLVM_INFODIR="${datadir}/info";
10 +eval LLVM_MANDIR="${datadir}/man";
11 +eval LLVM_LIBDIR="${libdir}";
12 +eval LLVM_LIBDIR_SUFFIX="`echo ${libdir} | sed 's,.*/lib\(.*\)\(/.*\|$\),\1,'`";
13 +eval CLANG_LIBDIR_SUFFIX="`echo ${libdir} | sed 's,.*/lib\(.*\)\(/.*\|$\),\1,'`";
14 LLVM_CONFIGTIME=`date`
18 AC_SUBST(LLVM_INCLUDEDIR)
19 AC_SUBST(LLVM_INFODIR)
21 +AC_SUBST(LLVM_LIBDIR)
22 +AC_SUBST(LLVM_LIBDIR_SUFFIX)
23 +AC_SUBST(CLANG_LIBDIR_SUFFIX)
24 AC_SUBST(LLVM_CONFIGTIME)
26 dnl Disable embedding timestamps in the build directory, with ENABLE_TIMESTAMPS.
27 @@ -1851,6 +1851,12 @@
28 [Installation directory for .info files])
29 AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR",
30 [Installation directory for man pages])
31 +AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR",
32 + [Installation directory for libraries])
33 +AC_DEFINE_UNQUOTED(LLVM_LIBDIR_SUFFIX, "$LLVM_LIBDIR_SUFFIX",
34 + [Installation directory for libraries])
35 +AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX, "$CLANG_LIBDIR_SUFFIX",
36 + [Installation directory for libraries])
37 AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME",
38 [Time at which LLVM was configured])
39 AC_DEFINE_UNQUOTED(LLVM_HOST_TRIPLE, "$host",
40 @@ -2029,10 +2029,6 @@
41 clang_src_root="$srcdir/tools/clang"
43 if test -f ${clang_src_root}/README.txt; then
44 - dnl Clang supports build systems which use the multilib libdir suffix.
45 - dnl The autoconf system doesn't support this so stub out that variable.
46 - AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX,"",
47 - [Multilib suffix for libdir.])
49 dnl Use variables to stay under 80 columns.
50 configh="include/clang/Config/config.h"
51 --- llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp.orig 2014-08-27 22:07:31.000000000 +0200
52 +++ llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp 2014-10-01 20:56:40.312848502 +0200
53 @@ -2999,19 +2999,6 @@
54 return Triple.isArch32Bit() ? "lib" : "lib64";
57 - // It happens that only x86 and PPC use the 'lib32' variant of oslibdir, and
58 - // using that variant while targeting other architectures causes problems
59 - // because the libraries are laid out in shared system roots that can't cope
60 - // with a 'lib32' library search path being considered. So we only enable
61 - // them when we know we may need it.
63 - // FIXME: This is a bit of a hack. We should really unify this code for
64 - // reasoning about oslibdir spellings with the lib dir spellings in the
65 - // GCCInstallationDetector, but that is a more significant refactoring.
66 - if (Triple.getArch() == llvm::Triple::x86 ||
67 - Triple.getArch() == llvm::Triple::ppc)
70 if (Triple.getArch() == llvm::Triple::x86_64 &&
71 Triple.getEnvironment() == llvm::Triple::GNUX32)
74 // Try walking via the GCC triple path in case of biarch or multiarch GCC
75 // installations with strange symlinks.
76 if (GCCInstallation.isValid()) {
77 - addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
78 + addPathIfExists(SysRoot + "/usr/" + OSLibDir + "/" + GCCInstallation.getTriple().str() +
79 "/../../" + OSLibDir, Paths);
81 // Add the 'other' biarch variant path
82 @@ -3190,10 +3177,10 @@
83 // FIXME: It's not clear whether we should use the driver's installed
84 // directory ('Dir' below) or the ResourceDir.
85 if (StringRef(D.Dir).startswith(SysRoot))
86 - addPathIfExists(D.Dir + "/../lib", Paths);
87 + addPathIfExists(D.Dir + "/../" + OSLibDir, Paths);
89 - addPathIfExists(SysRoot + "/lib", Paths);
90 - addPathIfExists(SysRoot + "/usr/lib", Paths);
91 + addPathIfExists(SysRoot + "/" + OSLibDir, Paths);
92 + addPathIfExists(SysRoot + "/usr/" + OSLibDir, Paths);
95 bool Linux::HasNativeLLVMSupport() const {
96 --- llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp.orig 2014-08-07 06:51:51.000000000 +0200
97 +++ llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp 2014-10-01 21:04:32.002828710 +0200
99 #include "llvm/ADT/StringExtras.h"
100 #include "llvm/ADT/StringSwitch.h"
101 #include "llvm/ADT/Twine.h"
102 +#include "llvm/Config/config.h"
103 #include "llvm/Option/Arg.h"
104 #include "llvm/Option/ArgList.h"
105 #include "llvm/Option/Option.h"
106 @@ -2037,12 +2038,7 @@
108 static SmallString<128> getCompilerRTLibDir(const ToolChain &TC) {
109 // The runtimes are located in the OS-specific resource directory.
110 - SmallString<128> Res(TC.getDriver().ResourceDir);
111 - const llvm::Triple &Triple = TC.getTriple();
112 - // TC.getOS() yield "freebsd10.0" whereas "freebsd" is expected.
113 - StringRef OSLibName =
114 - (Triple.getOS() == llvm::Triple::FreeBSD) ? "freebsd" : TC.getOS();
115 - llvm::sys::path::append(Res, "lib", OSLibName);
116 + SmallString<128> Res(LLVM_LIBDIR);
120 @@ -5899,9 +5895,9 @@
122 const char *LinkingOutput) const {
123 // FIXME: Find a real GCC, don't hard-code versions here
124 - std::string GCCLibPath = "/usr/gcc/4.5/lib/gcc/";
125 + std::string GCCLibPath = LLVM_LIBDIR "/gcc/";
126 const llvm::Triple &T = getToolChain().getTriple();
127 - std::string LibPath = "/usr/lib/";
128 + std::string LibPath = LLVM_LIBDIR "/";
129 llvm::Triple::ArchType Arch = T.getArch();
131 case llvm::Triple::x86:
132 --- llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile.orig 2014-05-22 23:13:30.000000000 +0200
133 +++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile 2014-10-18 22:10:17.008329250 +0200
135 $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
137 ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
138 -PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
139 +PROJ_resources := $(DESTDIR)$(PROJ_libdir)/clang/$(CLANG_VERSION)
141 ResourceLibDir := $(ResourceDir)/lib
142 ResourceIncludeDir := $(ResourceDir)/include
143 --- llvm-3.6.0.src/cmake/modules/Makefile~ 2015-01-05 21:24:36.000000000 +0000
144 +++ llvm-3.6.0.src/cmake/modules/Makefile 2015-03-01 13:56:38.156631157 +0000
146 -e 's/@LLVM_ENABLE_PIC@/'"$(ENABLE_PIC)"'/' \
147 -e 's/@LLVM_ON_UNIX@/'"$(LLVM_ON_UNIX)"'/' \
148 -e 's/@LLVM_ON_WIN32@/'"$(LLVM_ON_WIN32)"'/' \
149 - -e 's/@LLVM_LIBDIR_SUFFIX@//' \
150 + -e 's/@LLVM_LIBDIR_SUFFIX@/$(LLVM_LIBDIR_SUFFIX)/' \
151 -e 's/@LLVM_CONFIG_INCLUDE_DIRS@/'"$(subst /,\/,$(PROJ_includedir))"'/' \
152 -e 's/@LLVM_CONFIG_LIBRARY_DIRS@/'"$(subst /,\/,$(PROJ_libdir))"'/' \
153 -e 's/@LLVM_CONFIG_CMAKE_DIR@/'"$(subst /,\/,$(PROJ_cmake))"'/' \
154 --- llvm-3.6.0.src/tools/llvm-config/Makefile~ 2014-12-29 11:16:25.000000000 +0000
155 +++ llvm-3.6.0.src/tools/llvm-config/Makefile 2015-03-01 13:57:58.293294997 +0000
158 $(Verb) $(ECHO) 's/@LLVM_BUILDMODE@/$(subst /,\/,$(BuildMode))/' \
160 - $(Verb) $(ECHO) 's/@LLVM_LIBDIR_SUFFIX@//' \
161 + $(Verb) $(ECHO) 's/@LLVM_LIBDIR_SUFFIX@/$(subst /,\/,$(LLVM_LIBDIR_SUFFIX))/' \
163 $(Verb) $(ECHO) 's/@LLVM_SYSTEM_LIBS@/$(subst /,\/,$(LLVM_SYSTEM_LIBS))/' \
165 --- llvm-3.6.0.src/Makefile.config.in~ 2015-03-01 13:59:58.000000000 +0000
166 +++ llvm-3.6.0.src/Makefile.config.in 2015-03-01 14:18:47.196584274 +0000
169 TARGET_NATIVE_ARCH := $(ARCH)
170 LLVM_NATIVE_ARCH := @LLVM_NATIVE_ARCH@
171 +LLVM_LIBDIR_SUFFIX := @LLVM_LIBDIR_SUFFIX@
172 +CLANG_LIBDIR_SUFFIX := @LLVM_LIBDIR_SUFFIX@
174 # Indicates, whether we're cross-compiling LLVM or not
175 LLVM_CROSS_COMPILING=@LLVM_CROSS_COMPILING@
176 --- llvm-3.6.0.src/include/llvm/Config/config.h.in~ 2015-03-01 15:17:14.000000000 +0000
177 +++ llvm-3.6.0.src/include/llvm/Config/config.h.in 2015-03-01 15:54:08.119715796 +0000
179 /* include/llvm/Config/config.h.in. Generated from autoconf/configure.ac by autoheader. */
183 +#ifndef LLVM_CONFIG_H
184 +#define LLVM_CONFIG_H
186 /* Bug report URL. */
187 #undef BUG_REPORT_URL
188 --- llvm-3.6.0.src/tools/clang/include/clang/Config/config.h.in~ 2014-12-29 12:09:08.000000000 +0000
189 +++ llvm-3.6.0.src/tools/clang/include/clang/Config/config.h.in 2015-03-01 15:55:28.736379620 +0000
191 /* This generated file is for internal use. Do not include it from headers. */
194 +#ifdef CLANG_CONFIG_H
195 #error config.h can only be included once
198 +#define CLANG_CONFIG_H
200 /* Bug report URL. */
201 #undef BUG_REPORT_URL