From 75338097c786eea1c461e744a2c45af78f56286f Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Thu, 19 Apr 2012 19:27:54 +0000 Subject: Remove llvm-ld and llvm-stub (which is only used by llvm-ld). llvm-ld is no longer useful and causes confusion and so it is being removed. * Does not work very well on Windows because it must call a gcc like driver to assemble and link. * Has lots of hard coded paths which are wrong on many systems. * Does not understand most of ld's options. * Can be partially replaced by llvm-link | opt | {llc | as, llc -filetype=obj} | ld, or fully replaced by Clang. I know of no production use of llvm-ld, and hacking use should be replaced by Clang's driver. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155147 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 3 - docs/Bugpoint.html | 6 +- docs/CommandGuide/index.html | 3 - docs/CommandGuide/llvm-ld.pod | 234 --------- docs/FAQ.html | 211 +-------- docs/GettingStarted.html | 6 - docs/ReleaseNotes.html | 1 + docs/tutorial/LangImpl4.html | 7 +- docs/tutorial/OCamlLangImpl4.html | 7 +- examples/BrainF/BrainFDriver.cpp | 1 - projects/sample/Makefile.llvm.rules | 3 - test/CMakeLists.txt | 2 +- test/Linker/2008-03-07-DroppedSection_a.ll | 2 +- test/Linker/2008-03-07-DroppedSection_b.ll | 2 +- test/Linker/link-archive.ll | 16 - test/Linker/link-messages.ll | 7 +- test/lit.cfg | 4 +- tools/CMakeLists.txt | 2 - tools/LLVMBuild.txt | 2 +- tools/Makefile | 4 +- tools/llvm-ld/CMakeLists.txt | 8 - tools/llvm-ld/LLVMBuild.txt | 22 - tools/llvm-ld/Makefile | 14 - tools/llvm-ld/Optimize.cpp | 130 ----- tools/llvm-ld/llvm-ld.cpp | 732 ----------------------------- tools/llvm-stub/CMakeLists.txt | 3 - tools/llvm-stub/LLVMBuild.txt | 22 - tools/llvm-stub/Makefile | 15 - tools/llvm-stub/llvm-stub.c | 77 --- utils/findmisopt | 3 +- 30 files changed, 34 insertions(+), 1515 deletions(-) delete mode 100644 docs/CommandGuide/llvm-ld.pod delete mode 100644 test/Linker/link-archive.ll delete mode 100644 tools/llvm-ld/CMakeLists.txt delete mode 100644 tools/llvm-ld/LLVMBuild.txt delete mode 100644 tools/llvm-ld/Makefile delete mode 100644 tools/llvm-ld/Optimize.cpp delete mode 100644 tools/llvm-ld/llvm-ld.cpp delete mode 100644 tools/llvm-stub/CMakeLists.txt delete mode 100644 tools/llvm-stub/LLVMBuild.txt delete mode 100644 tools/llvm-stub/Makefile delete mode 100644 tools/llvm-stub/llvm-stub.c diff --git a/Makefile.rules b/Makefile.rules index 0984dc0..13dbbdd 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -537,9 +537,6 @@ ifeq ($(LLVM_CROSS_COMPILING),1) else LLVM_CONFIG := $(LLVMToolDir)/llvm-config$(EXEEXT) endif -ifndef LLVMLD -LLVMLD := $(LLVMToolDir)/llvm-ld$(EXEEXT) -endif ifndef LLVMDIS LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT) endif diff --git a/docs/Bugpoint.html b/docs/Bugpoint.html index 5454ff4..9794f2c 100644 --- a/docs/Bugpoint.html +++ b/docs/Bugpoint.html @@ -44,9 +44,9 @@ file, it will identify the optimization (or combination of optimizations) that causes the crash, and reduce the file down to a small example which triggers the crash.

-

For detailed case scenarios, such as debugging opt, -llvm-ld, or one of the LLVM code generators, see How To Submit a Bug Report document.

+

For detailed case scenarios, such as debugging opt, or one of the +LLVM code generators, see How To Submit a Bug +Report document.

diff --git a/docs/CommandGuide/index.html b/docs/CommandGuide/index.html index 5db7020..772a59f 100644 --- a/docs/CommandGuide/index.html +++ b/docs/CommandGuide/index.html @@ -63,9 +63,6 @@ options) arguments to the tool you are interested in.

  • llvm-prof - format raw `llvmprof.out' data into a human-readable report
    • -
  • llvm-ld - - general purpose linker with loadable runtime optimization support
    • -
  • llvm-config - print out LLVM compilation options, libraries, etc. as configured
    • diff --git a/docs/CommandGuide/llvm-ld.pod b/docs/CommandGuide/llvm-ld.pod deleted file mode 100644 index efa9ebd..0000000 --- a/docs/CommandGuide/llvm-ld.pod +++ /dev/null @@ -1,234 +0,0 @@ -=pod - -=head1 NAME - -llvm-ld - LLVM linker - -=head1 SYNOPSIS - -B - -=head1 DESCRIPTION - -The B tool takes a set of LLVM bitcode files and links them -together into a single LLVM bitcode file. The output bitcode file can be -another bitcode file or an executable bitcode program. Using additional -options, B is able to produce native code executables. - -The B tool is the main linker for LLVM. It is used to link together -the output of LLVM front-end compilers and run "link time" optimizations (mostly -the inter-procedural kind). - -The B tools attempts to mimic the interface provided by the default -system linker so that it can act as a I replacement. - -=head2 Search Order - -When looking for objects specified on the command line, B will search -for the object first in the current directory and then in the directory -specified by the B environment variable. If it cannot -find the object, it fails. - -When looking for a library specified with the B<-l> option, B first -attempts to load a file with that name from the current directory. If that -fails, it looks for libI.bc, libI.a, or libI.I, in that order, in each directory added to the library search -path with the B<-L> option. These directories are searched in the order they -are specified. If the library cannot be located, then B looks in the -directory specified by the B environment variable. If it -does not find a library there, it fails. - -The I may be I<.so>, I<.dyld>, I<.dll>, or something -different, depending upon the system. - -The B<-L> option is global. It does not matter where it is specified in the -list of command line arguments; the directory is simply added to the search path -and is applied to all libraries, preceding or succeeding, in the command line. - -=head2 Link order - -All object and bitcode files are linked first in the order they were -specified on the command line. All library files are linked next. -Some libraries may not be linked into the object program; see below. - -=head2 Library Linkage - -Object files and static bitcode objects are always linked into the output -file. Library archives (.a files) load only the objects within the archive -that define symbols needed by the output file. Hence, libraries should be -listed after the object files and libraries which need them; otherwise, the -library may not be linked in, and the dependent library will not have its -undefined symbols defined. - -=head2 Native code generation - -The B program has limited support for native code generation, when -using the B<-native> or B<-native-cbe> options. Native code generation is -performed by converting the linked bitcode into native assembly (.s) or C code -and running the system compiler (typically gcc) on the result. - -=head1 OPTIONS - -=head2 General Options - -=over - -=item B<-help> - -Print a summary of command line options. - -=item B<-v> - -Specifies verbose mode. In this mode the linker will print additional -information about the actions it takes, programs it executes, etc. - -=item B<-stats> - -Print statistics. - -=item B<-time-passes> - -Record the amount of time needed for each pass and print it to standard -error. - -=back - -=head2 Input/Output Options - -=over - -=item B<-o> F - -This overrides the default output file and specifies the name of the file that -should be generated by the linker. By default, B generates a file named -F for compatibility with B. The output will be written to -F. - -=item B<-b> F - -This option can be used to override the output bitcode file name. By default, -the name of the bitcode output file is one more ".bc" suffix added to the name -specified by B<-o filename> option. - -=item B<-l>F - -This option specifies the F of a library to search when resolving symbols -for the program. Only the base name should be specified as F, without a -F prefix or any suffix. - -=item B<-L>F - -This option tells B to look in F to find any library subsequently -specified with the B<-l> option. The paths will be searched in the order in -which they are specified on the command line. If the library is still not found, -a small set of system specific directories will also be searched. Note that -libraries specified with the B<-l> option that occur I any B<-L> options -will not search the paths given by the B<-L> options following it. - -=item B<-link-as-library> - -Link the bitcode files together as a library, not an executable. In this mode, -undefined symbols will be permitted. - -=item B<-r> - -An alias for -link-as-library. - -=item B<-native> - -Generate a native machine code executable. - -When generating native executables, B first checks for a bitcode -version of the library and links it in, if necessary. If the library is -missing, B skips it. Then, B links in the same -libraries as native code. - -In this way, B should be able to link in optimized bitcode -subsets of common libraries and then link in any part of the library that -hasn't been converted to bitcode. - -=item B<-native-cbe> - -Generate a native machine code executable with the LLVM C backend. - -This option is identical to the B<-native> option, but uses the -C backend to generate code for the program instead of an LLVM native -code generator. - -=back - -=head2 Optimization Options - -=over - -=item B<-disable-inlining> - -Do not run the inlining pass. Functions will not be inlined into other -functions. - -=item B<-disable-opt> - -Completely disable optimization. - -=item B<-disable-internalize> - -Do not mark all symbols as internal. - -=item B<-verify-each> - -Run the verification pass after each of the passes to verify intermediate -results. - -=item B<-strip-all> - -Strip all debug and symbol information from the executable to make it smaller. - -=item B<-strip-debug> - -Strip all debug information from the executable to make it smaller. - -=item B<-s> - -An alias for B<-strip-all>. - -=item B<-S> - -An alias for B<-strip-debug>. - -=item B<-export-dynamic> - -An alias for B<-disable-internalize> - -=item B<-post-link-opt>F - -Run post-link optimization program. After linking is completed a bitcode file -will be generated. It will be passed to the program specified by F as the -first argument. The second argument to the program will be the name of a -temporary file into which the program should place its optimized output. For -example, the "no-op optimization" would be a simple shell script: - - #!/bin/bash - cp $1 $2 - -=back - -=head1 EXIT STATUS - -If B succeeds, it will exit with 0 return code. If an error occurs, -it will exit with a non-zero return code. - -=head1 ENVIRONMENT - -The C environment variable is used to find bitcode -libraries. Any paths specified in this variable will be searched after the C<-L> -options. - -=head1 SEE ALSO - -L - -=head1 AUTHORS - -Maintained by the LLVM Team (L). - -=cut diff --git a/docs/FAQ.html b/docs/FAQ.html index 74e8534..2a46a9e 100644 --- a/docs/FAQ.html +++ b/docs/FAQ.html @@ -19,9 +19,6 @@
    1. License
        -
      1. Why are the LLVM source code and the front-end distributed under - different licenses?
        2. -
      2. Does the University of Illinois Open Source License really qualify as an "open source" license?
        3. @@ -72,8 +69,6 @@
      3. After Subversion update, rebuilding gives the error "No rule to make target".
        4. -
      4. When I compile LLVM-GCC with srcdir == objdir, - it fails. Why?
    2. Source Languages @@ -91,30 +86,17 @@ instruction. Help!
    -
  • Using the GCC Front End +
  • Using the C and C++ Front Ends
      -
    1. When I compile software that uses a configure script, the configure - script thinks my system has all of the header files and libraries it is - testing for. How do I get configure to work correctly?
      2. - -
    2. When I compile code using the LLVM GCC front end, it complains that it - cannot find libcrtend.a?
      3. - -
    3. How can I disable all optimizations when compiling code using the LLVM - GCC front end?
      4. - -
    4. Can I use LLVM to convert C++ code to C - code?
      5. -
    5. Can I compile C or C++ code to platform-independent LLVM bitcode?
    • -
  • Questions about code generated by the GCC front-end +
  • Questions about code generated by the demo page
    1. What is this llvm.global_ctors and - _GLOBAL__I__tmp_webcompile... stuff that happens when I + _GLOBAL__I_a... stuff that happens when I #include <iostream>?
    2. Where did all of my code go??
      3. @@ -143,19 +125,6 @@
      -

      Why are the LLVM source code and the front-end distributed under different - licenses?

      -
      - -
      -

      The C/C++ front-ends are based on GCC and must be distributed under the GPL. - Our aim is to distribute LLVM source code under a much less - restrictive license, in particular one that does not compel users who - distribute tools based on modifying the source to redistribute the modified - source code as well.

      -
      - -

      Does the University of Illinois Open Source License really qualify as an "open source" license?

      @@ -219,12 +188,9 @@ LLVM have been ported to a plethora of platforms.

      Some porting problems may exist in the following areas:

        -
      • The GCC front end code is not as portable as the LLVM suite, so it may not - compile as well on unsupported platforms.
        • - -
      • The LLVM build system relies heavily on UNIX shell tools, like the Bourne - Shell and sed. Porting to systems without these tools (MacOS 9, Plan 9) - will require more effort.
        • +
      • The autoconf/makefile build system relies heavily on UNIX shell tools, + like the Bourne Shell and sed. Porting to systems without these tools + (MacOS 9, Plan 9) Will require more effort.
      @@ -256,7 +222,7 @@ LLVM have been ported to a plethora of platforms.

      The configure script finds the right C compiler, but it uses the - LLVM linker from a previous build. What do I do?

      + LLVM tools from a previous build. What do I do?

      @@ -426,25 +392,6 @@ Stop. rebuilding.

      -
      -

      When I compile LLVM-GCC with srcdir == objdir, it - fails. Why?

      -
      - -
      -

      The GNUmakefile in the top-level directory of LLVM-GCC is a special - Makefile used by Apple to invoke the build_gcc script after - setting up a special environment. This has the unfortunate side-effect that - trying to build LLVM-GCC with srcdir == objdir in a "non-Apple way" invokes - the GNUmakefile instead of Makefile. Because the - environment isn't set up correctly to do this, the build fails.

      - -

      People not building LLVM-GCC the "Apple way" need to build LLVM-GCC with - srcdir != objdir, or simply remove the GNUmakefile entirely.

      - -

      We regret the inconvenience.

      -
      - @@ -460,12 +407,8 @@ Stop.

      LLVM currently has full support for C and C++ source languages. These are - available through a special version of GCC that LLVM calls the - C Front End

      - -

      There is an incomplete version of a Java front end available in the - java module. There is no documentation on this yet so you'll need to - download the code, compile it, and try it.

      + available through both Clang and + DragonEgg.

      The PyPy developers are working on integrating LLVM into the PyPy backend so that PyPy language can translate to LLVM.

      @@ -558,142 +501,12 @@ Stop.

      - Using the GCC Front End + Using the C and C++ Front Ends

      -

      When I compile software that uses a configure script, the configure script - thinks my system has all of the header files and libraries it is testing for. - How do I get configure to work correctly?

      -
      - -
      -

      The configure script is getting things wrong because the LLVM linker allows - symbols to be undefined at link time (so that they can be resolved during JIT - or translation to the C back end). That is why configure thinks your system - "has everything."

      - -

      To work around this, perform the following steps:

      - -
        -
      1. Make sure the CC and CXX environment variables contains the full path to - the LLVM GCC front end.
        2. - -
      2. Make sure that the regular C compiler is first in your PATH.
        3. - -
      3. Add the string "-Wl,-native" to your CFLAGS environment variable.
        4. -
      - -

      This will allow the llvm-ld linker to create a native code - executable instead of shell script that runs the JIT. Creating native code - requires standard linkage, which in turn will allow the configure script to - find out if code is not linking on your system because the feature isn't - available on your system.

      -
      - -
      -

      When I compile code using the LLVM GCC front end, it complains that it cannot - find libcrtend.a. -

      -
      - -
      -

      The only way this can happen is if you haven't installed the runtime - library. To correct this, do:

      - -
      -% cd llvm/runtime
-% make clean ; make install-bytecode
-
      -
      - -
      -

      How can I disable all optimizations when compiling code using the LLVM GCC - front end?

      -
      - -
      -

      Passing "-Wa,-disable-opt -Wl,-disable-opt" will disable *all* cleanup and - optimizations done at the llvm level, leaving you with the truly horrible - code that you desire.

      -
      - - -
      -

      Can I use LLVM to convert C++ code to C code?

      -
      - -
      -

      Yes, you can use LLVM to convert code from any language LLVM supports to C. - Note that the generated C code will be very low level (all loops are lowered - to gotos, etc) and not very pretty (comments are stripped, original source - formatting is totally lost, variables are renamed, expressions are - regrouped), so this may not be what you're looking for. Also, there are - several limitations noted below.

      - -

      Use commands like this:

      - -
        -

      1. Compile your program with llvm-g++:

        - -
        -% llvm-g++ -emit-llvm x.cpp -o program.bc -c
-
        - -

        or:

        - -
        -% llvm-g++ a.cpp -c -emit-llvm
-% llvm-g++ b.cpp -c -emit-llvm
-% llvm-ld a.o b.o -o program
-
        - -

        This will generate program and program.bc. The .bc - file is the LLVM version of the program all linked together.

        2. - -

      2. Convert the LLVM code to C code, using the LLC tool with the C - backend:

        - -
        -% llc -march=c program.bc -o program.c
-
        3. - -

      3. Finally, compile the C file:

        - -
        -% cc x.c -lstdc++
-
        4. - -
      - -

      Using LLVM does not eliminate the need for C++ library support. If you use - the llvm-g++ front-end, the generated code will depend on g++'s C++ support - libraries in the same way that code generated from g++ would. If you use - another C++ front-end, the generated code will depend on whatever library - that front-end would normally require.

      - -

      If you are working on a platform that does not provide any C++ libraries, you - may be able to manually compile libstdc++ to LLVM bitcode, statically link it - into your program, then use the commands above to convert the whole result - into C code. Alternatively, you might compile the libraries and your - application into two different chunks of C code and link them.

      - -

      Note that, by default, the C back end does not support exception handling. - If you want/need it for a certain program, you can enable it by passing - "-enable-correct-eh-support" to the llc program. The resultant code will use - setjmp/longjmp to implement exception support that is relatively slow, and - not C++-ABI-conforming on most platforms, but otherwise correct.

      - -

      Also, there are a number of other limitations of the C backend that cause it - to produce code that does not fully conform to the C++ ABI on most - platforms. Some of the C++ programs in LLVM's test suite are known to fail - when compiled with the C back end because of ABI incompatibilities with - standard C++ libraries.

      -
      - -

      Can I compile C or C++ code to platform-independent LLVM bitcode?

      @@ -719,14 +532,14 @@ Stop.

      - Questions about code generated by the GCC front-end + Questions about code generated by the demo page

      What is this llvm.global_ctors and - _GLOBAL__I__tmp_webcompile... stuff that happens when I #include + _GLOBAL__I_a... stuff that happens when I #include <iostream>?

      diff --git a/docs/GettingStarted.html b/docs/GettingStarted.html index 2bc17ea..561645f 100644 --- a/docs/GettingStarted.html +++ b/docs/GettingStarted.html @@ -1510,12 +1510,6 @@ information is in the Command Guide.

      The disassembler transforms the LLVM bitcode to human readable LLVM assembly.
      -
      llvm-ld
      -
      llvm-ld is a general purpose and extensible linker for LLVM. - It performs standard link time optimizations and allows optimization - modules to be loaded and run so that language specific optimizations can - be applied at link time.
      -
      llvm-link
      llvm-link, not surprisingly, links multiple LLVM modules into a single program.
      diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html index 54cfa20..e5f3047 100644 --- a/docs/ReleaseNotes.html +++ b/docs/ReleaseNotes.html @@ -604,6 +604,7 @@ syntax, there are still significant gaps in that support.

      • llvm-stress is a command line tool for generating random .ll files to fuzz different LLVM components.
        • +
      • llvm-ld has been removed. Use llvm-link or Clang instead.
      • ....
      diff --git a/docs/tutorial/LangImpl4.html b/docs/tutorial/LangImpl4.html index 77c9dbe..d2cac62 100644 --- a/docs/tutorial/LangImpl4.html +++ b/docs/tutorial/LangImpl4.html @@ -253,10 +253,9 @@ add instruction from every execution of this function.

      LLVM provides a wide variety of optimizations that can be used in certain circumstances. Some documentation about the various passes is available, but it isn't very complete. Another good source of -ideas can come from looking at the passes that llvm-gcc or -llvm-ld run to get started. The "opt" tool allows you to -experiment with passes from the command line, so you can see if they do -anything.

      +ideas can come from looking at the passes that Clang runs to get +started. The "opt" tool allows you to experiment with passes from the +command line, so you can see if they do anything.

      Now that we have reasonable code coming out of our front-end, lets talk about executing it!

      diff --git a/docs/tutorial/OCamlLangImpl4.html b/docs/tutorial/OCamlLangImpl4.html index fd2b5ad..dd31ded 100644 --- a/docs/tutorial/OCamlLangImpl4.html +++ b/docs/tutorial/OCamlLangImpl4.html @@ -270,10 +270,9 @@ add instruction from every execution of this function.

      LLVM provides a wide variety of optimizations that can be used in certain circumstances. Some documentation about the various passes is available, but it isn't very complete. Another good source of -ideas can come from looking at the passes that llvm-gcc or -llvm-ld run to get started. The "opt" tool allows you to -experiment with passes from the command line, so you can see if they do -anything.

      +ideas can come from looking at the passes that Clang runs to get +started. The "opt" tool allows you to experiment with passes from the +command line, so you can see if they do anything.

      Now that we have reasonable code coming out of our front-end, lets talk about executing it!

      diff --git a/examples/BrainF/BrainFDriver.cpp b/examples/BrainF/BrainFDriver.cpp index cdbf02a..58617b7 100644 --- a/examples/BrainF/BrainFDriver.cpp +++ b/examples/BrainF/BrainFDriver.cpp @@ -21,7 +21,6 @@ // ./BrainF prog.bf #Write as BitCode // // lli prog.bf.bc #Run generated BitCode -// llvm-ld -native -o=prog prog.bf.bc #Compile BitCode into native executable // //===--------------------------------------------------------------------===// diff --git a/projects/sample/Makefile.llvm.rules b/projects/sample/Makefile.llvm.rules index 6e04724..c980d6b 100644 --- a/projects/sample/Makefile.llvm.rules +++ b/projects/sample/Makefile.llvm.rules @@ -463,9 +463,6 @@ ifndef LLVM_TBLGEN endif endif LLVM_CONFIG := $(LLVMToolDir)/llvm-config -ifndef LLVMLD -LLVMLD := $(LLVMToolDir)/llvm-ld$(EXEEXT) -endif ifndef LLVMDIS LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT) endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8cebb7c..37af141 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -75,7 +75,7 @@ add_dependencies(check.deps UnitTests BugpointPasses LLVMHello llc lli llvm-ar llvm-as llvm-dis llvm-extract llvm-dwarfdump - llvm-ld llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj + llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj macho-dump opt FileCheck count not json-bench) set_target_properties(check.deps PROPERTIES FOLDER "Tests") diff --git a/test/Linker/2008-03-07-DroppedSection_a.ll b/test/Linker/2008-03-07-DroppedSection_a.ll index 4458971..ec9d5c2 100644 --- a/test/Linker/2008-03-07-DroppedSection_a.ll +++ b/test/Linker/2008-03-07-DroppedSection_a.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s > %t.bc ; RUN: llvm-as < %p/2008-03-07-DroppedSection_b.ll > %t2.bc -; RUN: llvm-ld -r -disable-opt %t.bc %t2.bc -o %t3.bc +; RUN: llvm-link %t.bc %t2.bc -o %t3.bc ; RUN: llvm-dis < %t3.bc | grep ".data.init_task" ; ModuleID = 't.bc' diff --git a/test/Linker/2008-03-07-DroppedSection_b.ll b/test/Linker/2008-03-07-DroppedSection_b.ll index 884bf0a..63b64f6 100644 --- a/test/Linker/2008-03-07-DroppedSection_b.ll +++ b/test/Linker/2008-03-07-DroppedSection_b.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s > %t.bc ; RUN: llvm-as < %p/2008-03-07-DroppedSection_a.ll > %t2.bc -; RUN: llvm-ld -r -disable-opt %t.bc %t2.bc -o %t3.bc +; RUN: llvm-link %t.bc %t2.bc -o %t3.bc ; RUN: llvm-dis < %t3.bc | grep ".data.init_task" ; ModuleID = 'u.bc' diff --git a/test/Linker/link-archive.ll b/test/Linker/link-archive.ll deleted file mode 100644 index 9251b4e..0000000 --- a/test/Linker/link-archive.ll +++ /dev/null @@ -1,16 +0,0 @@ -; Test linking of a bc file to an archive via llvm-ld. -; PR1434 -; RUN: rm -f %t.bar.a %t.foo.a -; RUN: llvm-as %s -o %t.bar.bc -; RUN: echo {define i32* @foo(i32 %x) \{ ret i32* @baz \} \ -; RUN: @baz = external global i32 } | llvm-as -o %t.foo.bc -; RUN: llvm-ar rcf %t.foo.a %t.foo.bc -; RUN: llvm-ar rcf %t.bar.a %t.bar.bc -; RUN: llvm-ld -disable-opt %t.bar.bc %t.foo.a -o %t.bc -; RUN: llvm-ld -disable-opt %t.foo.bc %t.bar.a -o %t.bc -declare i32* @foo(...) -define i32* @bar() { - %ret = call i32* (...)* @foo( i32 123 ) - ret i32* %ret -} -@baz = global i32 0 diff --git a/test/Linker/link-messages.ll b/test/Linker/link-messages.ll index 920782d..1faae18 100644 --- a/test/Linker/link-messages.ll +++ b/test/Linker/link-messages.ll @@ -2,10 +2,9 @@ ; that error is printed out. ; RUN: llvm-as %s -o %t.one.bc ; RUN: llvm-as %s -o %t.two.bc -; RUN: not llvm-ld -disable-opt -link-as-library %t.one.bc %t.two.bc \ -; RUN: -o %t.bc 2>%t.err -; RUN: grep "symbol multiply defined" %t.err +; RUN: not llvm-link %t.one.bc %t.two.bc -o %t.bc |& FileCheck %s +; CHECK: symbol multiply defined define i32 @bar() { - ret i32 0 + ret i32 0 } diff --git a/test/lit.cfg b/test/lit.cfg index d74bc7b..2383d8f 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -187,12 +187,12 @@ for pattern in [r"\bbugpoint\b(?!-)", r"(? - OptimizationList(cl::desc("Optimizations available:")); - -//Don't verify at the end -static cl::opt DontVerify("disable-verify", cl::ReallyHidden); - -static cl::opt DisableInline("disable-inlining", - cl::desc("Do not run the inliner pass")); - -static cl::opt -DisableOptimizations("disable-opt", - cl::desc("Do not run any optimization passes")); - -static cl::opt DisableInternalize("disable-internalize", - cl::desc("Do not mark all symbols as internal")); - -static cl::opt VerifyEach("verify-each", - cl::desc("Verify intermediate results of all passes")); - -static cl::alias ExportDynamic("export-dynamic", - cl::aliasopt(DisableInternalize), - cl::desc("Alias for -disable-internalize")); - -static cl::opt Strip("strip-all", - cl::desc("Strip all symbol info from executable")); - -static cl::alias A0("s", cl::desc("Alias for --strip-all"), - cl::aliasopt(Strip)); - -static cl::opt StripDebug("strip-debug", - cl::desc("Strip debugger symbol info from executable")); - -static cl::alias A1("S", cl::desc("Alias for --strip-debug"), - cl::aliasopt(StripDebug)); - -// A utility function that adds a pass to the pass manager but will also add -// a verifier pass after if we're supposed to verify. -static inline void addPass(PassManager &PM, Pass *P) { - // Add the pass to the pass manager... - PM.add(P); - - // If we are verifying all of the intermediate steps, add the verifier... - if (VerifyEach) - PM.add(createVerifierPass()); -} - -namespace llvm { -/// Optimize - Perform link time optimizations. This will run the scalar -/// optimizations, any loaded plugin-optimization modules, and then the -/// inter-procedural optimizations if applicable. -void Optimize(Module *M) { - - // Instantiate the pass manager to organize the passes. - PassManager Passes; - - // If we're verifying, start off with a verification pass. - if (VerifyEach) - Passes.add(createVerifierPass()); - - // Add an appropriate TargetData instance for this module... - addPass(Passes, new TargetData(M)); - - if (!DisableOptimizations) - PassManagerBuilder().populateLTOPassManager(Passes, !DisableInternalize, - !DisableInline); - - // If the -s or -S command line options were specified, strip the symbols out - // of the resulting program to make it smaller. -s and -S are GNU ld options - // that we are supporting; they alias -strip-all and -strip-debug. - if (Strip || StripDebug) - addPass(Passes, createStripSymbolsPass(StripDebug && !Strip)); - - // Create a new optimization pass for each one specified on the command line - std::auto_ptr target; - for (unsigned i = 0; i < OptimizationList.size(); ++i) { - const PassInfo *Opt = OptimizationList[i]; - if (Opt->getNormalCtor()) - addPass(Passes, Opt->getNormalCtor()()); - else - errs() << "llvm-ld: cannot create pass: " << Opt->getPassName() - << "\n"; - } - - // The user's passes may leave cruft around. Clean up after them them but - // only if we haven't got DisableOptimizations set - if (!DisableOptimizations) { - addPass(Passes, createInstructionCombiningPass()); - addPass(Passes, createCFGSimplificationPass()); - addPass(Passes, createAggressiveDCEPass()); - addPass(Passes, createGlobalDCEPass()); - } - - // Make sure everything is still good. - if (!DontVerify) - Passes.add(createVerifierPass()); - - // Run our queue of passes all at once now, efficiently. - Passes.run(*M); -} - -} diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp deleted file mode 100644 index ecf0476..0000000 --- a/tools/llvm-ld/llvm-ld.cpp +++ /dev/null @@ -1,732 +0,0 @@ -//===- llvm-ld.cpp - LLVM 'ld' compatible linker --------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This utility is intended to be compatible with GCC, and follows standard -// system 'ld' conventions. As such, the default output file is ./a.out. -// Additionally, this program outputs a shell script that is used to invoke LLI -// to execute the program. In this manner, the generated executable (a.out for -// example), is directly executable, whereas the bitcode file actually lives in -// the a.out.bc file generated by this program. -// -// Note that if someone (or a script) deletes the executable program generated, -// the .bc file will be left around. Considering that this is a temporary hack, -// I'm not too worried about this. -// -//===----------------------------------------------------------------------===// - -#include "llvm/LinkAllVMCore.h" -#include "llvm/Linker.h" -#include "llvm/LLVMContext.h" -#include "llvm/Support/Program.h" -#include "llvm/Module.h" -#include "llvm/PassManager.h" -#include "llvm/Bitcode/ReaderWriter.h" -#include "llvm/Target/TargetData.h" -#include "llvm/Target/TargetMachine.h" -#include "llvm/Support/CommandLine.h" -#include "llvm/Support/FileUtilities.h" -#include "llvm/Support/ManagedStatic.h" -#include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/PrettyStackTrace.h" -#include "llvm/Support/SystemUtils.h" -#include "llvm/Support/ToolOutputFile.h" -#include "llvm/Support/Signals.h" -#include -#include -using namespace llvm; - -// Rightly this should go in a header file but it just seems such a waste. -namespace llvm { -extern void Optimize(Module*); -} - -// Input/Output Options -static cl::list InputFilenames(cl::Positional, cl::OneOrMore, - cl::desc("")); - -static cl::opt OutputFilename("o", cl::init("a.out"), - cl::desc("Override output filename"), - cl::value_desc("filename")); - -static cl::opt BitcodeOutputFilename("b", cl::init(""), - cl::desc("Override bitcode output filename"), - cl::value_desc("filename")); - -static cl::opt Verbose("v", - cl::desc("Print information about actions taken")); - -static cl::list LibPaths("L", cl::Prefix, - cl::desc("Specify a library search path"), - cl::value_desc("directory")); - -static cl::list FrameworkPaths("F", cl::Prefix, - cl::desc("Specify a framework search path"), - cl::value_desc("directory")); - -static cl::list Libraries("l", cl::Prefix, - cl::desc("Specify libraries to link to"), - cl::value_desc("library prefix")); - -static cl::list Frameworks("framework", - cl::desc("Specify frameworks to link to"), - cl::value_desc("framework")); - -// Options to control the linking, optimization, and code gen processes -static cl::opt LinkAsLibrary("link-as-library", - cl::desc("Link the .bc files together as a library, not an executable")); - -static cl::alias Relink("r", cl::aliasopt(LinkAsLibrary), - cl::desc("Alias for -link-as-library")); - -static cl::opt Native("native", - cl::desc("Generate a native binary instead of a shell script")); - -static cl::optNativeCBE("native-cbe", - cl::desc("Generate a native binary with the C backend and GCC")); - -static cl::list PostLinkOpts("post-link-opts", - cl::value_desc("path"), - cl::desc("Run one or more optimization programs after linking")); - -static cl::list XLinker("Xlinker", cl::value_desc("option"), - cl::desc("Pass options to the system linker")); - -// Compatibility options that llvm-ld ignores but are supported for -// compatibility with LD -static cl::opt CO3("soname", cl::Hidden, - cl::desc("Compatibility option: ignored")); - -static cl::opt CO4("version-script", cl::Hidden, - cl::desc("Compatibility option: ignored")); - -static cl::opt CO5("eh-frame-hdr", cl::Hidden, - cl::desc("Compatibility option: ignored")); - -static cl::opt CO6("h", cl::Hidden, - cl::desc("Compatibility option: ignored")); - -static cl::opt CO7("start-group", cl::Hidden, - cl::desc("Compatibility option: ignored")); - -static cl::opt CO8("end-group", cl::Hidden, - cl::desc("Compatibility option: ignored")); - -static cl::opt CO9("m", cl::Hidden, - cl::desc("Compatibility option: ignored")); - -/// This is just for convenience so it doesn't have to be passed around -/// everywhere. -static std::string progname; - -/// FileRemover objects to clean up output files in the event of an error. -static FileRemover OutputRemover; -static FileRemover BitcodeOutputRemover; - -/// PrintAndExit - Prints a message to standard error and exits with error code -/// -/// Inputs: -/// Message - The message to print to standard error. -/// -static void PrintAndExit(const std::string &Message, Module *M, int errcode = 1) { - errs() << progname << ": " << Message << "\n"; - delete M; - llvm_shutdown(); - exit(errcode); -} - -static void PrintCommand(const std::vector &args) { - std::vector::const_iterator I = args.begin(), E = args.end(); - for (; I != E; ++I) - if (*I) - errs() << "'" << *I << "'" << " "; - errs() << "\n"; -} - -/// CopyEnv - This function takes an array of environment variables and makes a -/// copy of it. This copy can then be manipulated any way the caller likes -/// without affecting the process's real environment. -/// -/// Inputs: -/// envp - An array of C strings containing an environment. -/// -/// Return value: -/// NULL - An error occurred. -/// -/// Otherwise, a pointer to a new array of C strings is returned. Every string -/// in the array is a duplicate of the one in the original array (i.e. we do -/// not copy the char *'s from one array to another). -/// -static char ** CopyEnv(char ** const envp) { - // Count the number of entries in the old list; - unsigned entries; // The number of entries in the old environment list - for (entries = 0; envp[entries] != NULL; entries++) - /*empty*/; - - // Add one more entry for the NULL pointer that ends the list. - ++entries; - - // If there are no entries at all, just return NULL. - if (entries == 0) - return NULL; - - // Allocate a new environment list. - char **newenv = new char* [entries]; - if (newenv == NULL) - return NULL; - - // Make a copy of the list. Don't forget the NULL that ends the list. - entries = 0; - while (envp[entries] != NULL) { - size_t len = strlen(envp[entries]) + 1; - newenv[entries] = new char[len]; - memcpy(newenv[entries], envp[entries], len); - ++entries; - } - newenv[entries] = NULL; - - return newenv; -} - - -/// RemoveEnv - Remove the specified environment variable from the environment -/// array. -/// -/// Inputs: -/// name - The name of the variable to remove. It cannot be NULL. -/// envp - The array of environment variables. It cannot be NULL. -/// -/// Notes: -/// This is mainly done because functions to remove items from the environment -/// are not available across all platforms. In particular, Solaris does not -/// seem to have an unsetenv() function or a setenv() function (or they are -/// undocumented if they do exist). -/// -static void RemoveEnv(const char * name, char ** const envp) { - for (unsigned index=0; envp[index] != NULL; index++) { - // Find the first equals sign in the array and make it an EOS character. - char *p = strchr (envp[index], '='); - if (p == NULL) - continue; - else - *p = '\0'; - - // Compare the two strings. If they are equal, zap this string. - // Otherwise, restore it. - if (!strcmp(name, envp[index])) - *envp[index] = '\0'; - else - *p = '='; - } - - return; -} - -/// GenerateBitcode - generates a bitcode file from the module provided -void GenerateBitcode(Module* M, const std::string& FileName) { - - if (Verbose) - errs() << "Generating Bitcode To " << FileName << '\n'; - - // Create the output file. - std::string ErrorInfo; - tool_output_file Out(FileName.c_str(), ErrorInfo, - raw_fd_ostream::F_Binary); - if (!ErrorInfo.empty()) { - PrintAndExit(ErrorInfo, M); - return; - } - - // Write it out - WriteBitcodeToFile(M, Out.os()); - Out.keep(); -} - -/// GenerateAssembly - generates a native assembly language source file from the -/// specified bitcode file. -/// -/// Inputs: -/// InputFilename - The name of the input bitcode file. -/// OutputFilename - The name of the file to generate. -/// llc - The pathname to use for LLC. -/// envp - The environment to use when running LLC. -/// -/// Return non-zero value on error. -/// -static int GenerateAssembly(const std::string &OutputFilename, - const std::string &InputFilename, - const sys::Path &llc, - std::string &ErrMsg ) { - // Run LLC to convert the bitcode file into assembly code. - std::vector args; - args.push_back(llc.c_str()); - // We will use GCC to assemble the program so set the assembly syntax to AT&T, - // regardless of what the target in the bitcode file is. - args.push_back("-x86-asm-syntax=att"); - args.push_back("-o"); - args.push_back(OutputFilename.c_str()); - args.push_back(InputFilename.c_str()); - args.push_back(0); - - if (Verbose) { - errs() << "Generating Assembly With: \n"; - PrintCommand(args); - } - - return sys::Program::ExecuteAndWait(llc, &args[0], 0, 0, 0, 0, &ErrMsg); -} - -/// GenerateCFile - generates a C source file from the specified bitcode file. -static int GenerateCFile(const std::string &OutputFile, - const std::string &InputFile, - const sys::Path &llc, - std::string& ErrMsg) { - // Run LLC to convert the bitcode file into C. - std::vector args; - args.push_back(llc.c_str()); - args.push_back("-march=c"); - args.push_back("-o"); - args.push_back(OutputFile.c_str()); - args.push_back(InputFile.c_str()); - args.push_back(0); - - if (Verbose) { - errs() << "Generating C Source With: \n"; - PrintCommand(args); - } - - return sys::Program::ExecuteAndWait(llc, &args[0], 0, 0, 0, 0, &ErrMsg); -} - -/// GenerateNative - generates a native object file from the -/// specified bitcode file. -/// -/// Inputs: -/// InputFilename - The name of the input bitcode file. -/// OutputFilename - The name of the file to generate. -/// NativeLinkItems - The native libraries, files, code with which to link -/// LibPaths - The list of directories in which to find libraries. -/// FrameworksPaths - The list of directories in which to find frameworks. -/// Frameworks - The list of frameworks (dynamic libraries) -/// gcc - The pathname to use for GGC. -/// envp - A copy of the process's current environment. -/// -/// Outputs: -/// None. -/// -/// Returns non-zero value on error. -/// -static int GenerateNative(const std::string &OutputFilename, - const std::string &InputFilename, - const Linker::ItemList &LinkItems, - const sys::Path &gcc, char ** const envp, - std::string& ErrMsg) { - // Remove these environment variables from the environment of the - // programs that we will execute. It appears that GCC sets these - // environment variables so that the programs it uses can configure - // themselves identically. - // - // However, when we invoke GCC below, we want it to use its normal - // configuration. Hence, we must sanitize its environment. - char ** clean_env = CopyEnv(envp); - if (clean_env == NULL) - return 1; - RemoveEnv("LIBRARY_PATH", clean_env); - RemoveEnv("COLLECT_GCC_OPTIONS", clean_env); - RemoveEnv("GCC_EXEC_PREFIX", clean_env); - RemoveEnv("COMPILER_PATH", clean_env); - RemoveEnv("COLLECT_GCC", clean_env); - - - // Run GCC to assemble and link the program into native code. - // - // Note: - // We can't just assemble and link the file with the system assembler - // and linker because we don't know where to put the _start symbol. - // GCC mysteriously knows how to do it. - std::vector args; - args.push_back(gcc.c_str()); - args.push_back("-fno-strict-aliasing"); - args.push_back("-O3"); - args.push_back("-o"); - args.push_back(OutputFilename); - args.push_back(InputFilename); - - // Add in the library and framework paths - for (unsigned index = 0; index < LibPaths.size(); index++) { - args.push_back("-L" + LibPaths[index]); - } - for (unsigned index = 0; index < FrameworkPaths.size(); index++) { - args.push_back("-F" + FrameworkPaths[index]); - } - - // Add the requested options - for (unsigned index = 0; index < XLinker.size(); index++) - args.push_back(XLinker[index]); - - // Add in the libraries to link. - for (unsigned index = 0; index < LinkItems.size(); index++) - if (LinkItems[index].first != "crtend") { - if (LinkItems[index].second) - args.push_back("-l" + LinkItems[index].first); - else - args.push_back(LinkItems[index].first); - } - - // Add in frameworks to link. - for (unsigned index = 0; index < Frameworks.size(); index++) { - args.push_back("-framework"); - args.push_back(Frameworks[index]); - } - - // Now that "args" owns all the std::strings for the arguments, call the c_str - // method to get the underlying string array. We do this game so that the - // std::string array is guaranteed to outlive the const char* array. - std::vector Args; - for (unsigned i = 0, e = args.size(); i != e; ++i) - Args.push_back(args[i].c_str()); - Args.push_back(0); - - if (Verbose) { - errs() << "Generating Native Executable With:\n"; - PrintCommand(Args); - } - - // Run the compiler to assembly and link together the program. - int R = sys::Program::ExecuteAndWait( - gcc, &Args[0], const_cast(clean_env), 0, 0, 0, &ErrMsg); - delete [] clean_env; - return R; -} - -/// EmitShellScript - Output the wrapper file that invokes the JIT on the LLVM -/// bitcode file for the program. -static void EmitShellScript(char **argv, Module *M) { - if (Verbose) - errs() << "Emitting Shell Script\n"; -#if defined(_WIN32) - // Windows doesn't support #!/bin/sh style shell scripts in .exe files. To - // support windows systems, we copy the llvm-stub.exe executable from the - // build tree to the destination file. - std::string ErrMsg; - sys::Path llvmstub = PrependMainExecutablePath("llvm-stub", argv[0], - (void *)(intptr_t)&Optimize); - if (llvmstub.isEmpty()) - PrintAndExit("Could not find llvm-stub.exe executable!", M); - - if (0 != sys::CopyFile(sys::Path(OutputFilename), llvmstub, &ErrMsg)) - PrintAndExit(ErrMsg, M); - - return; -#else - - // Output the script to start the program... - std::string ErrorInfo; - tool_output_file Out2(OutputFilename.c_str(), ErrorInfo); - if (!ErrorInfo.empty()) - PrintAndExit(ErrorInfo, M); - - Out2.os() << "#!/bin/sh\n"; - // Allow user to setenv LLVMINTERP if lli is not in their PATH. - Out2.os() << "lli=${LLVMINTERP-lli}\n"; - Out2.os() << "exec $lli \\\n"; - // gcc accepts -l and implicitly searches /lib and /usr/lib. - LibPaths.push_back("/lib"); - LibPaths.push_back("/usr/lib"); - LibPaths.push_back("/usr/X11R6/lib"); - // We don't need to link in libc! In fact, /usr/lib/libc.so may not be a - // shared object at all! See RH 8: plain text. - std::vector::iterator libc = - std::find(Libraries.begin(), Libraries.end(), "c"); - if (libc != Libraries.end()) Libraries.erase(libc); - // List all the shared object (native) libraries this executable will need - // on the command line, so that we don't have to do this manually! - for (std::vector::iterator i = Libraries.begin(), - e = Libraries.end(); i != e; ++i) { - // try explicit -L arguments first: - sys::Path FullLibraryPath; - for (cl::list::const_iterator P = LibPaths.begin(), - E = LibPaths.end(); P != E; ++P) { - FullLibraryPath = *P; - FullLibraryPath.appendComponent("lib" + *i); - FullLibraryPath.appendSuffix(sys::Path::GetDLLSuffix()); - if (!FullLibraryPath.isEmpty()) { - if (!FullLibraryPath.isDynamicLibrary()) { - // Not a native shared library; mark as invalid - FullLibraryPath = sys::Path(); - } else break; - } - } - if (FullLibraryPath.isEmpty()) - FullLibraryPath = sys::Path::FindLibrary(*i); - if (!FullLibraryPath.isEmpty()) - Out2.os() << " -load=" << FullLibraryPath.str() << " \\\n"; - } - Out2.os() << " " << BitcodeOutputFilename << " ${1+\"$@\"}\n"; - Out2.keep(); -#endif -} - -// BuildLinkItems -- This function generates a LinkItemList for the LinkItems -// linker function by combining the Files and Libraries in the order they were -// declared on the command line. -static void BuildLinkItems( - Linker::ItemList& Items, - const cl::list& Files, - const cl::list& Libraries) { - - // Build the list of linkage items for LinkItems. - - cl::list::const_iterator fileIt = Files.begin(); - cl::list::const_iterator libIt = Libraries.begin(); - - int libPos = -1, filePos = -1; - while ( libIt != Libraries.end() || fileIt != Files.end() ) { - if (libIt != Libraries.end()) - libPos = Libraries.getPosition(libIt - Libraries.begin()); - else - libPos = -1; - if (fileIt != Files.end()) - filePos = Files.getPosition(fileIt - Files.begin()); - else - filePos = -1; - - if (filePos != -1 && (libPos == -1 || filePos < libPos)) { - // Add a source file - Items.push_back(std::make_pair(*fileIt++, false)); - } else if (libPos != -1 && (filePos == -1 || libPos < filePos)) { - // Add a library - Items.push_back(std::make_pair(*libIt++, true)); - } - } -} - -int main(int argc, char **argv, char **envp) { - // Print a stack trace if we signal out. - sys::PrintStackTraceOnErrorSignal(); - PrettyStackTraceProgram X(argc, argv); - - LLVMContext &Context = getGlobalContext(); - llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. - - // Initialize passes - PassRegistry &Registry = *PassRegistry::getPassRegistry(); - initializeCore(Registry); - initializeScalarOpts(Registry); - initializeIPO(Registry); - initializeAnalysis(Registry); - initializeIPA(Registry); - initializeTransformUtils(Registry); - initializeInstCombine(Registry); - initializeTarget(Registry); - - // Initial global variable above for convenience printing of program name. - progname = sys::path::stem(argv[0]); - - // Parse the command line options - cl::ParseCommandLineOptions(argc, argv, "llvm linker\n"); - -#if defined(_WIN32) || defined(__CYGWIN__) - if (!LinkAsLibrary) { - // Default to "a.exe" instead of "a.out". - if (OutputFilename.getNumOccurrences() == 0) - OutputFilename = "a.exe"; - - // If there is no suffix add an "exe" one. - if (sys::path::extension(OutputFilename).empty()) - OutputFilename.append(".exe"); - } -#endif - - // Generate the bitcode for the optimized module. - // If -b wasn't specified, use the name specified - // with -o to construct BitcodeOutputFilename. - if (BitcodeOutputFilename.empty()) { - BitcodeOutputFilename = OutputFilename; - if (!LinkAsLibrary) BitcodeOutputFilename += ".bc"; - } - - // Arrange for the bitcode output file to be deleted on any errors. - BitcodeOutputRemover.setFile(BitcodeOutputFilename); - sys::RemoveFileOnSignal(sys::Path(BitcodeOutputFilename)); - - // Arrange for the output file to be deleted on any errors. - if (!LinkAsLibrary) { - OutputRemover.setFile(OutputFilename); - sys::RemoveFileOnSignal(sys::Path(OutputFilename)); - } - - // Construct a Linker (now that Verbose is set) - Linker TheLinker(progname, OutputFilename, Context, Verbose); - - // Keep track of the native link items (versus the bitcode items) - Linker::ItemList NativeLinkItems; - - // Add library paths to the linker - TheLinker.addPaths(LibPaths); - TheLinker.addSystemPaths(); - - // Remove any consecutive duplicates of the same library... - Libraries.erase(std::unique(Libraries.begin(), Libraries.end()), - Libraries.end()); - - if (LinkAsLibrary) { - std::vector Files; - for (unsigned i = 0; i < InputFilenames.size(); ++i ) - Files.push_back(sys::Path(InputFilenames[i])); - if (TheLinker.LinkInFiles(Files)) - return 1; // Error already printed - - // The libraries aren't linked in but are noted as "dependent" in the - // module. - for (cl::list::const_iterator I = Libraries.begin(), - E = Libraries.end(); I != E ; ++I) { - TheLinker.getModule()->addLibrary(*I); - } - } else { - // Build a list of the items from our command line - Linker::ItemList Items; - BuildLinkItems(Items, InputFilenames, Libraries); - - // Link all the items together - if (TheLinker.LinkInItems(Items, NativeLinkItems) ) - return 1; // Error already printed - } - - std::auto_ptr Composite(TheLinker.releaseModule()); - - // Optimize the module - Optimize(Composite.get()); - - // Generate the bitcode output. - GenerateBitcode(Composite.get(), BitcodeOutputFilename); - - // If we are not linking a library, generate either a native executable - // or a JIT shell script, depending upon what the user wants. - if (!LinkAsLibrary) { - // If the user wants to run a post-link optimization, run it now. - if (!PostLinkOpts.empty()) { - std::vector opts = PostLinkOpts; - for (std::vector::iterator I = opts.begin(), - E = opts.end(); I != E; ++I) { - sys::Path prog(*I); - if (!prog.canExecute()) { - prog = sys::Program::FindProgramByName(*I); - if (prog.isEmpty()) - PrintAndExit(std::string("Optimization program '") + *I + - "' is not found or not executable.", Composite.get()); - } - // Get the program arguments - sys::Path tmp_output("opt_result"); - std::string ErrMsg; - if (tmp_output.createTemporaryFileOnDisk(true, &ErrMsg)) - PrintAndExit(ErrMsg, Composite.get()); - - const char* args[4]; - args[0] = I->c_str(); - args[1] = BitcodeOutputFilename.c_str(); - args[2] = tmp_output.c_str(); - args[3] = 0; - if (0 == sys::Program::ExecuteAndWait(prog, args, 0,0,0,0, &ErrMsg)) { - if (tmp_output.isBitcodeFile()) { - sys::Path target(BitcodeOutputFilename); - target.eraseFromDisk(); - if (tmp_output.renamePathOnDisk(target, &ErrMsg)) - PrintAndExit(ErrMsg, Composite.get(), 2); - } else - PrintAndExit("Post-link optimization output is not bitcode", - Composite.get()); - } else { - PrintAndExit(ErrMsg, Composite.get()); - } - } - } - - // If the user wants to generate a native executable, compile it from the - // bitcode file. - // - // Otherwise, create a script that will run the bitcode through the JIT. - if (Native) { - // Name of the Assembly Language output file - sys::Path AssemblyFile ( OutputFilename); - AssemblyFile.appendSuffix("s"); - - // Mark the output files for removal. - FileRemover AssemblyFileRemover(AssemblyFile.str()); - sys::RemoveFileOnSignal(AssemblyFile); - - // Determine the locations of the llc and gcc programs. - sys::Path llc = PrependMainExecutablePath("llc", argv[0], - (void *)(intptr_t)&Optimize); - if (llc.isEmpty()) - PrintAndExit("Failed to find llc", Composite.get()); - - sys::Path gcc = sys::Program::FindProgramByName("gcc"); - if (gcc.isEmpty()) - PrintAndExit("Failed to find gcc", Composite.get()); - - // Generate an assembly language file for the bitcode. - std::string ErrMsg; - if (0 != GenerateAssembly(AssemblyFile.str(), BitcodeOutputFilename, - llc, ErrMsg)) - PrintAndExit(ErrMsg, Composite.get()); - - if (0 != GenerateNative(OutputFilename, AssemblyFile.str(), - NativeLinkItems, gcc, envp, ErrMsg)) - PrintAndExit(ErrMsg, Composite.get()); - } else if (NativeCBE) { - sys::Path CFile (OutputFilename); - CFile.appendSuffix("cbe.c"); - - // Mark the output files for removal. - FileRemover CFileRemover(CFile.str()); - sys::RemoveFileOnSignal(CFile); - - // Determine the locations of the llc and gcc programs. - sys::Path llc = PrependMainExecutablePath("llc", argv[0], - (void *)(intptr_t)&Optimize); - if (llc.isEmpty()) - PrintAndExit("Failed to find llc", Composite.get()); - - sys::Path gcc = sys::Program::FindProgramByName("gcc"); - if (gcc.isEmpty()) - PrintAndExit("Failed to find gcc", Composite.get()); - - // Generate an assembly language file for the bitcode. - std::string ErrMsg; - if (GenerateCFile(CFile.str(), BitcodeOutputFilename, llc, ErrMsg)) - PrintAndExit(ErrMsg, Composite.get()); - - if (GenerateNative(OutputFilename, CFile.str(), - NativeLinkItems, gcc, envp, ErrMsg)) - PrintAndExit(ErrMsg, Composite.get()); - } else { - EmitShellScript(argv, Composite.get()); - } - - // Make the script executable... - std::string ErrMsg; - if (sys::Path(OutputFilename).makeExecutableOnDisk(&ErrMsg)) - PrintAndExit(ErrMsg, Composite.get()); - - // Make the bitcode file readable and directly executable in LLEE as well - if (sys::Path(BitcodeOutputFilename).makeExecutableOnDisk(&ErrMsg)) - PrintAndExit(ErrMsg, Composite.get()); - - if (sys::Path(BitcodeOutputFilename).makeReadableOnDisk(&ErrMsg)) - PrintAndExit(ErrMsg, Composite.get()); - } - - // Operations which may fail are now complete. - BitcodeOutputRemover.releaseFile(); - if (!LinkAsLibrary) - OutputRemover.releaseFile(); - - // Graceful exit - return 0; -} diff --git a/tools/llvm-stub/CMakeLists.txt b/tools/llvm-stub/CMakeLists.txt deleted file mode 100644 index a98dc9e..0000000 --- a/tools/llvm-stub/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_tool(llvm-stub - llvm-stub.c - ) diff --git a/tools/llvm-stub/LLVMBuild.txt b/tools/llvm-stub/LLVMBuild.txt deleted file mode 100644 index 5c3534c..0000000 --- a/tools/llvm-stub/LLVMBuild.txt +++ /dev/null @@ -1,22 +0,0 @@ -;===- ./tools/llvm-stub/LLVMBuild.txt --------------------------*- Conf -*--===; -; -; The LLVM Compiler Infrastructure -; -; This file is distributed under the University of Illinois Open Source -; License. See LICENSE.TXT for details. -; -;===------------------------------------------------------------------------===; -; -; This is an LLVMBuild description file for the components in this subdirectory. -; -; For more information on the LLVMBuild system, please see: -; -; http://llvm.org/docs/LLVMBuild.html -; -;===------------------------------------------------------------------------===; - -[component_0] -type = Tool -name = llvm-stub -parent = Tools -required_libraries = diff --git a/tools/llvm-stub/Makefile b/tools/llvm-stub/Makefile deleted file mode 100644 index 077efa2..0000000 --- a/tools/llvm-stub/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- tools/llvm-stub/Makefile ----------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL := ../.. -TOOLNAME := llvm-stub -LINK_COMPONENTS := object - -include $(LEVEL)/Makefile.common - diff --git a/tools/llvm-stub/llvm-stub.c b/tools/llvm-stub/llvm-stub.c deleted file mode 100644 index 69cd6ed..0000000 --- a/tools/llvm-stub/llvm-stub.c +++ /dev/null @@ -1,77 +0,0 @@ -/*===- llvm-stub.c - Stub executable to run llvm bitcode files ------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This tool is used by the gccld program to enable transparent execution of -// bitcode files by the user. Specifically, gccld outputs two files when asked -// to compile a file: -// 1. It outputs the LLVM bitcode file to .bc -// 2. It outputs a stub executable that runs lli on .bc -// -// This allows the end user to just say ./ and have the JIT executed -// automatically. On unix, the stub executable emitted is actually a bourne -// shell script that does the forwarding. Windows does not like #!/bin/sh -// programs in .exe files, so we make it an actual program, defined here. -// -//===----------------------------------------------------------------------===*/ - -#include -#include -#include - -#include "llvm/Config/config.h" - -#if defined(HAVE_UNISTD_H) && !defined(_MSC_VER) -#include -#endif - -#ifdef _WIN32 -#include -#include -#endif - -int main(int argc, char** argv) { - const char *Interp = getenv("LLVMINTERP"); - const char **Args; - if (Interp == 0) Interp = "lli"; - - /* Set up the command line options to pass to the JIT. */ - Args = (const char**)malloc(sizeof(char*) * (argc+2)); - /* argv[0] is the JIT */ - Args[0] = Interp; - -#ifdef LLVM_ON_WIN32 - { - int len = strlen(argv[0]); - if (len < 4 || strcmp(argv[0] + len - 4, ".exe") != 0) { - /* .exe suffix is stripped off of argv[0] if the executable was run on the - * command line without one. Put it back on. - */ - argv[0] = strcat(strcpy((char*)malloc(len + 5), argv[0]), ".exe"); - } - } -#endif - - /* argv[1] is argv[0] + ".bc". */ - Args[1] = strcat(strcpy((char*)malloc(strlen(argv[0])+4), argv[0]), ".bc"); - - /* The rest of the args are as before. */ - memcpy((char **)Args+2, argv+1, sizeof(char*)*argc); - - /* Run the JIT. */ -#if !defined(_WIN32) || defined(__MINGW64__) - execvp(Interp, (char **)Args); /* POSIX execvp takes a char *const[]. */ -#else - execvp(Interp, Args); /* windows execvp takes a const char *const *. */ -#endif - /* if _execv returns, the JIT could not be started. */ - fprintf(stderr, "Could not execute the LLVM JIT. Either add 'lli' to your" - " path, or set the\ninterpreter you want to use in the LLVMINTERP " - "environment variable.\n"); - return 1; -} diff --git a/utils/findmisopt b/utils/findmisopt index f2a872c..88f991a 100755 --- a/utils/findmisopt +++ b/utils/findmisopt @@ -76,8 +76,7 @@ echo " Optimized program: $optprog" # Define the list of optimizations to run. This comprises the same set of # optimizations that opt -std-compile-opts and gccld run, in the same order. opt_switches=`llvm-as < /dev/null -o - | opt -std-compile-opts -disable-output -debug-pass=Arguments 2>&1 | sed 's/Pass Arguments: //'` -ld_switches=`llvm-as < /dev/null -o - | llvm-ld - -debug-pass=Arguments 2>&1 | sed 's/Pass Arguments: //'` -all_switches="$opt_switches $ld_switches" +all_switches="$opt_switches" echo "Passes : $all_switches" # Create output directory if it doesn't exist -- cgit v1.1