This is an archive of the discontinued LLVM Phabricator instance.

Differential D8269

Move the 'linker-script-test' binary to the tools directory.
ClosedPublic

Authored by chandlerc on Mar 11 2015, 2:51 PM.

Details

Reviewers
ruiu
Commits
rG5ad16c2ad03c: Move the 'linker-script-test' binary to the tools directory.
rLLD231973: Move the 'linker-script-test' binary to the tools directory.
rL231973: Move the 'linker-script-test' binary to the tools directory.
Summary

The canonical LLVM directory arrangement places binaries in the 'utils/'
tree when they are used as part of building the project. For example,
the tblgen binaries are built out of 'utils/' trees.

Tools which are not used by any other part of the build, including
testing utilities, are just in the 'tools' directory. For example, in
Clang we have 'c-index-test' which is exactly the same kind of thing as
'linker-script-test'.

Diff Detail

Repository
rL LLVM

Event Timeline

chandlerc updated this revision to Diff 21771.Mar 11 2015, 2:51 PM
chandlerc retitled this revision from to Move the 'linker-script-test' binary to the tools directory..
chandlerc updated this object.
chandlerc edited the test plan for this revision. (Show Details)
chandlerc added a reviewer: ruiu.
chandlerc added a subscriber: Unknown Object (MLST).
ruiu accepted this revision.Mar 11 2015, 2:55 PM
ruiu edited edge metadata.

LGTM

This revision is now accepted and ready to land.Mar 11 2015, 2:55 PM
Closed by commit rL231973: Move the 'linker-script-test' binary to the tools directory. (authored by chandlerc). · Explain WhyMar 11 2015, 3:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
1 line
2 lines
tools/
1 line
2 lines
linker-script-test/
8 lines
24 lines
57 lines
utils/
1 line
17 lines
linker-script-test/
8 lines
24 lines
57 lines

Diff 21776

lld/trunk/CMakeLists.txt

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines install(DIRECTORY include/
FILES_MATCHING FILES_MATCHING
PATTERN "*.h" PATTERN "*.h"
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
endif() endif()
add_subdirectory(lib) add_subdirectory(lib)
add_subdirectory(tools) add_subdirectory(tools)
add_subdirectory(utils)
add_subdirectory(test) add_subdirectory(test)
if (LLVM_INCLUDE_TESTS) if (LLVM_INCLUDE_TESTS)
add_subdirectory(unittests) add_subdirectory(unittests)
endif() endif()
add_subdirectory(docs) add_subdirectory(docs)

lld/trunk/Makefile

##===- Makefile --------------------------------------------*- Makefile -*-===## ##===- Makefile --------------------------------------------*- Makefile -*-===##
# #
# The LLVM Compiler Infrastructure # The LLVM Compiler Infrastructure
# #
# This file is distributed under the University of Illinois Open Source # This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details. # License. See LICENSE.TXT for details.
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
# If LLD_LEVEL is not set, then we are the top-level Makefile. Otherwise, we # If LLD_LEVEL is not set, then we are the top-level Makefile. Otherwise, we
# are being included from a subdirectory makefile. # are being included from a subdirectory makefile.
ifndef LLD_LEVEL ifndef LLD_LEVEL
IS_TOP_LEVEL := 1 IS_TOP_LEVEL := 1
LLD_LEVEL := . LLD_LEVEL := .
DIRS := include lib tools utils unittests DIRS := include lib tools unittests
PARALLEL_DIRS := PARALLEL_DIRS :=
endif endif
ifeq ($(MAKECMDGOALS),libs-only) ifeq ($(MAKECMDGOALS),libs-only)
DIRS := $(filter-out tools docs, $(DIRS)) DIRS := $(filter-out tools docs, $(DIRS))
OPTIONAL_DIRS := OPTIONAL_DIRS :=
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines

lld/trunk/tools/CMakeLists.txt

add_subdirectory(linker-script-test)
add_subdirectory(lld) add_subdirectory(lld)

lld/trunk/tools/Makefile

##===- tools/Makefile --------------------------------------*- Makefile -*-===## ##===- tools/Makefile --------------------------------------*- Makefile -*-===##
# #
# The LLVM Compiler Infrastructure # The LLVM Compiler Infrastructure
# #
# This file is distributed under the University of Illinois Open Source # This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details. # License. See LICENSE.TXT for details.
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LLD_LEVEL := .. LLD_LEVEL := ..
LEVEL := $(LLD_LEVEL)/../.. LEVEL := $(LLD_LEVEL)/../..
include $(LLD_LEVEL)/../../Makefile.config include $(LLD_LEVEL)/../../Makefile.config
DIRS := lld PARALLEL_DIRS := linker-script-test lld
include $(LLD_LEVEL)/Makefile include $(LLD_LEVEL)/Makefile

lld/trunk/tools/linker-script-test/CMakeLists.txt

add_llvm_executable(linker-script-test
linker-script-test.cpp
)
target_link_libraries(linker-script-test
LLVMSupport
lldReaderWriter
)

lld/trunk/tools/linker-script-test/Makefile

##===-------------- linker-script-test/Makefile ----------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
#
##===--------------------------------------------------------------------===##
LLD_LEVEL := ../..
TOOLNAME = linker-script-test
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
#include /Makefile.config
LEVEL := $(LLD_LEVEL)/../..
include $(LEVEL)/Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD)
USEDLIBS = lldReaderWriter.a lldCore.a LLVMSupport.a
include $(LLD_LEVEL)/Makefile

lld/trunk/tools/linker-script-test/linker-script-test.cpp

//===- utils/linker-script-test/linker-script-test.cpp --------------------===//
//
// The LLVM Linker
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
///
/// \file
/// \brief Tool for testing linker script parsing.
///
//===----------------------------------------------------------------------===//
#include "lld/ReaderWriter/LinkerScript.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Signals.h"
using namespace llvm;
using namespace lld;
using namespace script;
int main(int argc, const char **argv) {
llvm::sys::PrintStackTraceOnErrorSignal();
llvm::PrettyStackTraceProgram X(argc, argv);
{
ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
MemoryBuffer::getFileOrSTDIN(argv[1]);
if (std::error_code ec = mb.getError()) {
llvm::errs() << ec.message() << "\n";
return 1;
}
Lexer l(std::move(mb.get()));
Token tok;
while (true) {
l.lex(tok);
tok.dump(llvm::outs());
if (tok._kind == Token::eof || tok._kind == Token::unknown)
break;
}
}
{
ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
MemoryBuffer::getFileOrSTDIN(argv[1]);
if (std::error_code ec = mb.getError()) {
llvm::errs() << ec.message() << "\n";
return 1;
}
Parser p(std::move(mb.get()));
if (!p.parse()) {
LinkerScript *ls = p.get();
ls->dump(llvm::outs());
}
}
}

lld/trunk/utils/CMakeLists.txt

add_subdirectory(linker-script-test)

lld/trunk/utils/Makefile

##===- tools/Makefile --------------------------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
LLD_LEVEL := ..
LEVEL := $(LLD_LEVEL)/../..
include $(LLD_LEVEL)/../../Makefile.config
DIRS := linker-script-test
include $(LLD_LEVEL)/Makefile

lld/trunk/utils/linker-script-test/CMakeLists.txt

add_llvm_executable(linker-script-test
linker-script-test.cpp
)
target_link_libraries(linker-script-test
LLVMSupport
lldReaderWriter
)

lld/trunk/utils/linker-script-test/Makefile

##===-------------- linker-script-test/Makefile ----------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
#
##===--------------------------------------------------------------------===##
LLD_LEVEL := ../..
TOOLNAME = linker-script-test
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
#include /Makefile.config
LEVEL := $(LLD_LEVEL)/../..
include $(LEVEL)/Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD)
USEDLIBS = lldReaderWriter.a lldCore.a LLVMSupport.a
include $(LLD_LEVEL)/Makefile

lld/trunk/utils/linker-script-test/linker-script-test.cpp

//===- utils/linker-script-test/linker-script-test.cpp --------------------===//
//
// The LLVM Linker
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
///
/// \file
/// \brief Tool for testing linker script parsing.
///
//===----------------------------------------------------------------------===//
#include "lld/ReaderWriter/LinkerScript.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Signals.h"
using namespace llvm;
using namespace lld;
using namespace script;
int main(int argc, const char **argv) {
llvm::sys::PrintStackTraceOnErrorSignal();
llvm::PrettyStackTraceProgram X(argc, argv);
{
ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
MemoryBuffer::getFileOrSTDIN(argv[1]);
if (std::error_code ec = mb.getError()) {
llvm::errs() << ec.message() << "\n";
return 1;
}
Lexer l(std::move(mb.get()));
Token tok;
while (true) {
l.lex(tok);
tok.dump(llvm::outs());
if (tok._kind == Token::eof || tok._kind == Token::unknown)
break;
}
}
{
ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
MemoryBuffer::getFileOrSTDIN(argv[1]);
if (std::error_code ec = mb.getError()) {
llvm::errs() << ec.message() << "\n";
return 1;
}
Parser p(std::move(mb.get()));
if (!p.parse()) {
LinkerScript *ls = p.get();
ls->dump(llvm::outs());
}
}
}
lld/trunk/utils/linker-script-test/CMakeLists.txt