- started update to 3.7.0

- switched build system to cmake

diff --git a/build-lld.patch b/build-lld.patch
new file mode 100644 (file)
index 0000000..7f089eb
--- /dev/null
+++ b/build-lld.patch
@@ -0,0 +1,13 @@
+--- llvm-3.7.0.src/tools/Makefile.old  2014-12-12 18:31:24.000000000 +0100
++++ llvm-3.7.0.src/tools/Makefile      2015-06-08 06:04:13.000000000 +0200
+@@ -19,8 +19,9 @@
+   OPTIONAL_PARALLEL_DIRS := clang
+ endif
+ 
+-# Build LLDB if present. Note LLDB must be built last as it depends on
++# Build LLD and LLDB if present. Note LLDB must be built last as it depends on
+ # the wider LLVM infrastructure (including Clang).
++OPTIONAL_PARALLEL_DIRS += lld
+ OPTIONAL_DIRS := lldb
+ 
+ # NOTE: The tools are organized into five groups of four consisting of one

diff --git a/libdir.patch b/libdir.patch
new file mode 100644 (file)
index 0000000..ecb2ffc
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,11 @@
+--- llvm-3.7.0.src/tools/polly/cmake/polly_macros.cmake~       2015-06-29 21:57:59.000000000 +0200
++++ llvm-3.7.0.src/tools/polly/cmake/polly_macros.cmake        2015-09-09 21:36:43.080128117 +0200
+@@ -46,7 +46,7 @@
+   endif(MSVC)
+   install(TARGETS ${name}
+     EXPORT LLVMExports
+-    LIBRARY DESTINATION lib
++    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+     ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
+ endmacro(add_polly_library)

diff --git a/llvm-lld-link.patch b/llvm-lld-link.patch
deleted file mode 100644 (file)
index 1fe936c..0000000
--- a/llvm-lld-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- llvm-3.5.0.src/tools/lld/unittests/CoreTests/Makefile.orig 2014-06-04 11:54:07.000000000 +0200
-+++ llvm-3.5.0.src/tools/lld/unittests/CoreTests/Makefile      2014-10-09 21:31:24.823754108 +0200
-@@ -9,6 +9,6 @@
- 
- LLD_LEVEL = ../..
- TESTNAME = CoreTest
--LLVMLIBS = gtest.a LLVMOption.a LLVMSupport.a
-+LINK_COMPONENTS = support option
- 
- include $(LLD_LEVEL)/unittests/Makefile

diff --git a/llvm-pld.patch b/llvm-pld.patch
index 0d00ac78711c3f5fbf96dfc85a1ad3fa92b0fa00..b93a34887413344621fb84913aed5cac0a2d5cb2 100644 (file)
--- a/llvm-pld.patch
+++ b/llvm-pld.patch
@@ -2,45 +2,45 @@
 +++ llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp       2014-10-01 21:29:07.449433463 +0200
 @@ -1333,6 +1333,7 @@
  
-   static const char *const X86_64LibDirs[] = { "/lib64", "/lib" };
+   static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
    static const char *const X86_64Triples[] = {
-+    "x86_64-pld-linux", "amd64-pld-linux",
-     "x86_64-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-pc-linux-gnu",
-     "x86_64-redhat-linux6E", "x86_64-redhat-linux", "x86_64-suse-linux",
-     "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", "x86_64-slackware-linux",
++      "x86_64-pld-linux", "amd64-pld-linux",
+       "x86_64-linux-gnu",       "x86_64-unknown-linux-gnu",
+       "x86_64-pc-linux-gnu",    "x86_64-redhat-linux6E",
+       "x86_64-redhat-linux",    "x86_64-suse-linux",
 @@ -1341,6 +1342,7 @@
-   static const char *const X32LibDirs[] = { "/libx32" };
-   static const char *const X86LibDirs[] = { "/lib32", "/lib" };
+   static const char *const X32LibDirs[] = {"/libx32"};
+   static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {
-+    "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux",
-     "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu", "i386-linux-gnu",
-     "i386-redhat-linux6E", "i686-redhat-linux", "i586-redhat-linux",
-     "i386-redhat-linux", "i586-suse-linux", "i486-slackware-linux",
++      "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux",
+       "i686-linux-gnu",       "i686-pc-linux-gnu",     "i486-linux-gnu",
+       "i386-linux-gnu",       "i386-redhat-linux6E",   "i686-redhat-linux",
+       "i586-redhat-linux",    "i386-redhat-linux",     "i586-suse-linux",
 @@ -1370,6 +1372,7 @@
  
-   static const char *const PPCLibDirs[] = { "/lib32", "/lib" };
+   static const char *const PPCLibDirs[] = {"/lib32", "/lib"};
    static const char *const PPCTriples[] = {
-+    "powerpc-pld-linux",
-     "powerpc-linux-gnu", "powerpc-unknown-linux-gnu", "powerpc-linux-gnuspe",
-     "powerpc-suse-linux", "powerpc-montavista-linuxspe"
-   };
++      "powerpc-pld-linux",
+       "powerpc-linux-gnu", "powerpc-unknown-linux-gnu", "powerpc-linux-gnuspe",
+       "powerpc-suse-linux", "powerpc-montavista-linuxspe"};
+   static const char *const PPC64LibDirs[] = {"/lib64", "/lib"};
 @@ -1385,14 +1388,14 @@
                                                  "ppc64le-redhat-linux" };
  
-   static const char *const SPARCv8LibDirs[] = { "/lib32", "/lib" };
--  static const char *const SPARCv8Triples[] = { "sparc-linux-gnu",
-+  static const char *const SPARCv8Triples[] = { "sparc-pld-linux", "sparc-linux-gnu",
-                                                 "sparcv8-linux-gnu" };
-   static const char *const SPARCv9LibDirs[] = { "/lib64", "/lib" };
--  static const char *const SPARCv9Triples[] = { "sparc64-linux-gnu",
-+  static const char *const SPARCv9Triples[] = { "sparc64-pld-linux", "sparc64-linux-gnu",
-                                                 "sparcv9-linux-gnu" };
+   static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"};
+-  static const char *const SPARCv8Triples[] = {"sparc-linux-gnu",
++  static const char *const SPARCv8Triples[] = {"sparc-pld-linux", "sparc-linux-gnu",
+                                                "sparcv8-linux-gnu"};
+   static const char *const SPARCv9LibDirs[] = {"/lib64", "/lib"};
+-  static const char *const SPARCv9Triples[] = {"sparc64-linux-gnu",
++  static const char *const SPARCv9Triples[] = {"sparc64-pld-linux", "sparc64-linux-gnu",
+                                                "sparcv9-linux-gnu"};
  
-   static const char *const SystemZLibDirs[] = { "/lib64", "/lib" };
+   static const char *const SystemZLibDirs[] = {"/lib64", "/lib"};
 -  static const char *const SystemZTriples[] = {
-+  static const char *const SystemZTriples[] = { "s390x-pld-linux",
-     "s390x-linux-gnu", "s390x-unknown-linux-gnu", "s390x-ibm-linux-gnu",
-     "s390x-suse-linux", "s390x-redhat-linux"
++  static const char *const SystemZTriples[] = {"s390x-pld-linux",
+       "s390x-linux-gnu", "s390x-unknown-linux-gnu", "s390x-ibm-linux-gnu",
+       "s390x-suse-linux", "s390x-redhat-linux"
    };
 @@ -2778,6 +2781,7 @@
  
@@ -89,7 +89,7 @@
          (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
        ExtraOpts.push_back("--hash-style=gnu");
  
-@@ -3058,11 +3069,11 @@
+@@ -3058,10 +3069,10 @@
        ExtraOpts.push_back("--hash-style=both");
    }
  
@@ -97,9 +97,8 @@
 +  if (IsRedhat(Distro) || IsPLD(Distro))
      ExtraOpts.push_back("--no-add-needed");
  
-   if (Distro == DebianSqueeze || Distro == DebianWheezy ||
--      Distro == DebianJessie || IsOpenSUSE(Distro) ||
-+      Distro == DebianJessie || IsOpenSUSE(Distro) || IsPLD(Distro) ||
+-  if ((IsDebian(Distro) && Distro >= DebianSqueeze) || IsOpenSUSE(Distro) ||
++  if ((IsDebian(Distro) && Distro >= DebianSqueeze) || IsOpenSUSE(Distro) || IsPLD(Distro) ||
        (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) ||
        (IsUbuntu(Distro) && Distro >= UbuntuKarmic))
      ExtraOpts.push_back("--build-id");

diff --git a/llvm-use-ocamlfind-for-ocamldoc.patch b/llvm-use-ocamlfind-for-ocamldoc.patch
deleted file mode 100644 (file)
index 8a838c3..0000000
--- a/llvm-use-ocamlfind-for-ocamldoc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -upr llvm-3.6.0.src.orig/docs/Makefile llvm-3.6.0.src/docs/Makefile
---- llvm-3.6.0.src.orig/docs/Makefile  2014-10-29 00:45:25.000000000 +0200
-+++ llvm-3.6.0.src/docs/Makefile       2015-02-28 10:12:35.647351241 +0200
-@@ -41,7 +41,7 @@ install_targets := install-html
- ifeq ($(ENABLE_DOXYGEN),1)
- install_targets += install-doxygen
- endif
--ifdef OCAMLDOC
-+ifdef OCAMLFIND
- ifneq (,$(filter ocaml,$(BINDINGS_TO_BUILD)))
- install_targets += install-ocamldoc
- endif
-@@ -49,7 +49,7 @@ endif
- install-local:: $(install_targets)
- 
- generated_targets := doxygen
--ifdef OCAMLDOC
-+ifdef OCAMLFIND
- generated_targets += ocamldoc
- endif
- 
-@@ -120,7 +120,7 @@ regen-ocamldoc:
-       $(Verb) $(MAKE) -C $(LEVEL)/bindings/ocaml ocamldoc
-       $(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
-       $(Verb) \
--              $(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
-+              $(OCAMLFIND) ocamldoc -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
-               `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \
-                        -path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'`
- 

diff --git a/llvm.spec b/llvm.spec
index ac64158d385cacde7e4c058179f5238e95b84b24..36ae55ef309f37841a39e6afa33c825b00093bba 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -16,32 +16,32 @@
 Summary:       The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
 Summary(pl.UTF-8):     Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
 Name:          llvm
-Version:       3.6.2
-Release:       3
+Version:       3.7.0
+Release:       0.1
 License:       University of Illinois/NCSA Open Source License
 Group:         Development/Languages
 #Source0Download: http://llvm.org/releases/download.html
 Source0:       http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz
-# Source0-md5: 0c1ee3597d75280dee603bae9cbf5cc2
+# Source0-md5: b98b9495e5655a672d6cb83e1a180f8e
 Source1:       http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.xz
-# Source1-md5: ff862793682f714bb7862325b9c06e20
+# Source1-md5: 8f9d27335e7331cf0a4711e952f21f01
 Source2:       http://llvm.org/releases/%{version}/compiler-rt-%{version}.src.tar.xz
-# Source2-md5: e3bc4eb7ba8c39a6fe90d6c988927f3c
+# Source2-md5: 383c10affd513026f08936b5525523f5
 Source3:       http://llvm.org/releases/%{version}/lldb-%{version}.src.tar.xz
-# Source3-md5: 51e5eb552f777b950bb0ff326e60d5f0
+# Source3-md5: e5931740400d1dc3e7db4c7ba2ceff68
 Source4:       http://llvm.org/releases/%{version}/polly-%{version}.src.tar.xz
-# Source4-md5: 09dd91d06cc0832095379d00206bc3a1
+# Source4-md5: 32f93ffc9cc7e042df22089761558f8b
 Source5:       http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.tar.xz
-# Source5-md5: 3ebc1dc41659fcec3db1b47d81575e06
+# Source5-md5: d5a87dacb65d981a427a536f6964642e
 Source6:       http://llvm.org/releases/%{version}/lld-%{version}.src.tar.xz
-# Source6-md5: 7143cc4fa88851a9f9b9a03621fbb387
+# Source6-md5: 91bd593a67293d84dad0bf11845546c2
 # Data files should be installed with timestamps preserved
 Patch1:                %{name}-2.6-timestamp.patch
 Patch2:                %{name}-pld.patch
-Patch3:                %{name}-use-ocamlfind-for-ocamldoc.patch
+Patch3:                build-lld.patch
 Patch4:                %{name}-lldb.patch
 Patch5:                %{name}-lldb-atomic.patch
-Patch6:                %{name}-lld-link.patch
+Patch6:                libdir.patch
 Patch7:                x32-gcc-toolchain.patch
 URL:           http://llvm.org/
 BuildRequires: autoconf >= 2.60
@@ -439,11 +439,11 @@ mv lld-%{version}.src tools/lld
 %patch7 -p1
 
 # configure does not properly specify libdir
-%{__sed} -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in
+#%{__sed} -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in
 # clang resources
-%{__sed} -i 's|(PROJ_prefix)/lib/|(PROJ_prefix)/%{_lib}/|g' \
-       tools/clang/lib/Headers/Makefile \
-       tools/clang/runtime/compiler-rt/Makefile
+#%{__sed} -i 's|(PROJ_prefix)/lib/|(PROJ_prefix)/%{_lib}/|g' \
+#      tools/clang/lib/Headers/Makefile \
+#      tools/clang/runtime/compiler-rt/Makefile
 %{__sed} -i 's|"lib"|"%{_lib}"|' tools/clang/lib/Driver/Driver.cpp
 
 %ifarch x32
@@ -459,52 +459,59 @@ grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{
 }'
 
 %build
-install -d obj
-%if "%{_lib}" != "lib"
-# workaround for clang relative search paths building
-install -d obj/Release
-ln -snf lib obj/Release/%{_lib}
-%endif
-
-cd autoconf
-%{__aclocal} -I m4
-%{__autoconf} -o ../configure configure.ac
-cd ..
-%{__autoheader} -I autoconf -I autoconf/m4 autoconf/configure.ac
-%if %{with polly}
-cd tools/polly/autoconf
-%{__aclocal} -I m4 -I ../../../autoconf/m4
-%{__autoconf} -o ../configure configure.ac
-cd ..
-%{__autoheader} -I autoconf -I autoconf/m4 -I ../../../autoconf/m4 autoconf/configure.ac
-cd ../..
-%endif
+install -d build
+#%if "%{_lib}" != "lib"
+## workaround for clang relative search paths building
+#install -d build/Release
+#ln -snf lib build/Release/%{_lib}
+#%endif
+
+#cd autoconf
+#%{__aclocal} -I m4
+#%{__autoconf} -o ../configure configure.ac
+#cd ..
+#%{__autoheader} -I autoconf -I autoconf/m4 autoconf/configure.ac
+#%if %{with polly}
+#cd tools/polly/autoconf
+#%{__aclocal} -I m4 -I ../../../autoconf/m4
+#%{__autoconf} -o ../configure configure.ac
+#cd ..
+#%{__autoheader} -I autoconf -I autoconf/m4 -I ../../../autoconf/m4 autoconf/configure.ac
+#cd ../..
+#%endif
 
 # Disabling assertions now, rec. by pure and needed for OpenGTL
 # TESTFIX no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3801
 #
 # bash specific 'test a < b'
-cd obj
+cd build
 CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64"
 
-bash ../%configure \
-       --datadir=%{_datadir}/%{name}-%{version} \
-       --disable-assertions \
-       --enable-cxx11 \
+%{cmake} ../ \
+%ifarch %{x8664}
+       -DLLVM_LIBDIR_SUFFIX:STRING=64 \
+%endif
+%ifarch x32
+       -DLLVM_LIBDIR_SUFFIX:STRING=x32 \
+%endif
 %ifarch %{ix86}
-       --disable-pic \
+       -DLLVM_ENABLE_PIC:BOOL=OFF \
 %endif
-       --disable-static \
-       --enable-bindings=%{?with_ocaml:ocaml}%{!?with_ocaml:none} \
-       --enable-debug-runtime \
 %if %{with apidocs}
-       --enable-doxygen \
+       -DLLVM_ENABLE_DOXYGEN:BOOL=ON \
 %endif
-       --enable-experimental-targets=R600 \
-       --enable-jit \
-       --enable-optimized \
-       --enable-shared \
-       --with-pic
+%if %{with doc}
+       -DLLVM_ENABLE_SPHINX:BOOL=ON \
+%endif
+       -DLLVM_ENABLE_ASSERTIONS:BOOL=OFF \
+       -DLLVM_ENABLE_CXX1Y:BOOL=ON \
+       -DLLVM_BINDINGS_LIST:LIST="go%{?with_ocaml:;ocaml};python" \
+       -DBUILD_SHARED_LIBS:BOOL=ON
+
+#bash ../%%configure \
+#      --datadir=%{_datadir}/%{name}-%{version} \
+#      --enable-jit \
+#      --enable-optimized
 
 %{__make} \
        VERBOSE=1 \
@@ -516,16 +523,20 @@ bash ../%configure \
 %{__make} -C tools/clang test 2>&1 | tee clang-testlog.txt
 %endif
 
-cd ..
-
 %if %{with doc}
-%{__make} -C docs -f Makefile.sphinx man
-%{__make} -C tools/clang/tools/extra/docs html
+%{__make} -C docs docs-llvm-html
+%{__make} -C docs docs-llvm-man
+%{__make} -C docs ocaml_doc
+%{__make} -C tools/clang/docs docs-clang-html
+%{__make} -C tools/clang/docs docs-clang-man
+%{__make} -C tools/lld/docs docs-lld-html
+%{__make} -C tools/lldb/docs lldb-python-doc
+%{__make} -C tools/lldb/docs lldb-cpp-doc
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} -C obj -j1 install \
+%{__make} -C build install \
        PROJ_docsdir=/moredocs \
        VERBOSE=1 \
        DESTDIR=$RPM_BUILD_ROOT
@@ -538,6 +549,7 @@ for f in scan-{build,view}; do
        ln -s %{_libdir}/clang-analyzer/$f/$f $RPM_BUILD_ROOT%{_bindir}/$f
        cp -pr tools/clang/tools/$f $RPM_BUILD_ROOT%{_libdir}/clang-analyzer
 done
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-build/scan-build.1 $RPM_BUILD_ROOT%{_mandir}/man1
 %py_comp $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-view
 %py_ocomp $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-view
@@ -546,7 +558,6 @@ done
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-build/*.bat
 
 %if %{with doc}
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
 cp -p docs/_build/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 # these tools are not installed
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{FileCheck,llvm-build}.1
@@ -580,7 +591,6 @@ done
 %{__rm} -v $RPM_BUILD_ROOT%{_libdir}/*LLVMHello.*
 # parts of test suite
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/{FileCheck,count,not}
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/linker-script-test
 
 # remove documentation makefiles:
 # they require the build directory to work
@@ -629,7 +639,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/llvm-stress
 %attr(755,root,root) %{_bindir}/llvm-symbolizer
 %attr(755,root,root) %{_bindir}/llvm-tblgen
-%attr(755,root,root) %{_bindir}/llvm-vtabledump
+%attr(755,root,root) %{_bindir}/llvm-cxxdump
+%attr(755,root,root) %{_bindir}/llvm-pdbdump
 %attr(755,root,root) %{_bindir}/macho-dump
 %attr(755,root,root) %{_bindir}/obj2yaml
 %attr(755,root,root) %{_bindir}/opt
@@ -662,7 +673,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libLLVM-%{version}.so
-%attr(755,root,root) %{_libdir}/libLLVM-3.6.so
+%attr(755,root,root) %{_libdir}/libLLVM-3.7.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -718,7 +729,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with rt}
 %{_libdir}/clang/%{version}/lib
 %endif
-%{_mandir}/man1/clang.1*
+#%{_mandir}/man1/clang.1*
 
 %files -n clang-analyzer
 %defattr(644,root,root,755)
@@ -746,7 +757,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n clang-doc
 %defattr(644,root,root,755)
-%doc tools/clang/docs/*.{css,html,png,txt}
+%doc tools/clang/docs/*.{html,png,txt}
 
 %if %{with apidocs}
 %files -n clang-apidocs
@@ -789,11 +800,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -n lldb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/lldb
-%attr(755,root,root) %{_bindir}/lldb-gdbserver
+%attr(755,root,root) %{_bindir}/lldb-server
 %attr(755,root,root) %{_bindir}/lldb-mi
-%attr(755,root,root) %{_bindir}/lldb-platform
 %attr(755,root,root) %{_libdir}/liblldb.so
 %dir %{py_sitedir}/lldb
+%attr(755,root,root) %{py_sitedir}/lldb/argdumper
 %attr(755,root,root) %{py_sitedir}/lldb/_lldb.so
 %attr(755,root,root) %{py_sitedir}/readline.so
 

diff --git a/x32-gcc-toolchain.patch b/x32-gcc-toolchain.patch
index 39928751f0f6d081aff820b004e3940cc7f11059..fffe393339470f13dec7fad44f5ecec966bc70ac 100644 (file)
--- a/x32-gcc-toolchain.patch
+++ b/x32-gcc-toolchain.patch
@@ -1,16 +1,15 @@
 --- llvm-3.6.2.src/tools/clang/lib/Driver/ToolChains.cpp~      2015-07-26 12:48:18.000000000 +0200
 +++ llvm-3.6.2.src/tools/clang/lib/Driver/ToolChains.cpp       2015-07-26 17:44:56.883613971 +0200
-@@ -1312,6 +1312,10 @@
-     "x86_64-linux-android", "x86_64-unknown-linux"
-   };
-   static const char *const X32LibDirs[] = { "/libx32" };
+@@ -1312,6 +1312,9 @@
+       "x86_64-slackware-linux", "x86_64-linux-android",
+       "x86_64-unknown-linux"};
+   static const char *const X32LibDirs[] = {"/libx32"};
 +  static const char *const X32Triples[] = {
-+    "x86_64-pld-linux-gnux32", "amd64-pld-linux-gnux32",
-+    "x86_64-linux-gnux32", "x86_64-unknown-linux-gnux32", "x86_64-pc-linux-gnux32"
-+  };
-   static const char *const X86LibDirs[] = { "/lib32", "/lib" };
++      "x86_64-pld-linux-gnux32", "amd64-pld-linux-gnux32",
++      "x86_64-linux-gnux32", "x86_64-unknown-linux-gnux32", "x86_64-pc-linux-gnux32"};
+   static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {
-     "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux",
+       "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux",
 @@ -1407,15 +1407,19 @@
      }
      break;