Get 'make tidy' to work rustllvm and rt again

This commit is contained in:
Brian Anderson 2011-10-21 17:35:52 -07:00
parent 93d940de54
commit 160c56e768
6 changed files with 145 additions and 145 deletions

View File

@ -82,18 +82,17 @@ check-fast: tidy \
tidy: tidy:
@$(call E, check: formatting) @$(call E, check: formatting)
$(Q)echo \ $(Q)echo \
$(filter-out $(GENERATED) $(addprefix $(S)src/, $(GENERATED)) \
$(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \ $(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
$(RUSTLLVM_HDR) $(PKG_3RDPARTY) \ $(RUSTLLVM_HDR) \
$(RUNTIME_CS) $(RUNTIME_HDR) $(RUNTIME_S)) \ $(RUNTIME_CS) $(RUNTIME_HDR) $(RUNTIME_S)) \
$(S)src/etc/%, \ $(wildcard $(S)src/etc/*.py) \
$(COMPILER_CRATE) \ $(COMPILER_CRATE) \
$(COMPILER_INPUTS) \ $(COMPILER_INPUTS) \
$(STDLIB_CRATE) \ $(STDLIB_CRATE) \
$(STDLIB_INPUTS) \ $(STDLIB_INPUTS) \
$(COMPILETEST_CRATE) \ $(COMPILETEST_CRATE) \
$(COMPILETEST_INPUTS) \ $(COMPILETEST_INPUTS) \
$(ALL_TEST_INPUTS)) \ $(ALL_TEST_INPUTS) \
| xargs -n 10 python $(S)src/etc/tidy.py | xargs -n 10 python $(S)src/etc/tidy.py

View File

@ -1,15 +1,15 @@
//===-- RustGCPrinter.cpp - Rust garbage collection map printer -----------===// //===-- RustGCPrinter.cpp - Rust garbage collection map printer -----------===
// //
// 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.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===
// //
// This file defines the emitter for the Rust garbage collection stack maps. // This file defines the emitter for the Rust garbage collection stack maps.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===
#include "llvm/Constants.h" #include "llvm/Constants.h"
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"

View File

@ -1,15 +1,15 @@
//===- RustGCStrategy.cpp - Rust garbage collection strategy ----*- C++ -*-===// //===- RustGCStrategy.cpp - Rust garbage collection strategy ----*- C++ -*-===
// //
// 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.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===
// //
// This file defines the garbage collection strategy for Rust. // This file defines the garbage collection strategy for Rust.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===
#include "llvm/CodeGen/GCs.h" #include "llvm/CodeGen/GCs.h"
#include "llvm/CodeGen/GCStrategy.h" #include "llvm/CodeGen/GCStrategy.h"

View File

@ -1,16 +1,16 @@
//===- RustWrapper.cpp - Rust wrapper for core functions --------*- C++ -*-===// //===- RustWrapper.cpp - Rust wrapper for core functions --------*- C++ -*-===
// //
// 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.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===
// //
// This file defines alternate interfaces to core functions that are more // This file defines alternate interfaces to core functions that are more
// readily callable by Rust's FFI. // readily callable by Rust's FFI.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===
#include "llvm/Linker.h" #include "llvm/Linker.h"
#include "llvm/PassManager.h" #include "llvm/PassManager.h"
@ -60,7 +60,8 @@ extern "C" bool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src) {
return true; return true;
} }
extern "C" void LLVMRustWriteOutputFile(LLVMPassManagerRef PMR, extern "C" void
LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
LLVMModuleRef M, LLVMModuleRef M,
const char *triple, const char *triple,
const char *path, const char *path,