[llvm-commits] [compiler-rt] r145631 - in /compiler-rt/trunk/lib/asan: Makefile.old asan_internal.h asan_linux.cc asan_mac.cc asan_mac.h asan_malloc_linux.cc asan_malloc_mac.cc asan_rtl.cc mach_override/mach_override.c mach_override/mach_override.h
Kostya Serebryany
kcc at google.com
Thu Dec 1 13:40:52 PST 2011
Author: kcc
Date: Thu Dec 1 15:40:52 2011
New Revision: 145631
URL: http://llvm.org/viewvc/llvm-project?rev=145631&view=rev
Log:
[asan] flatten the asan-rt build slightly
Modified:
compiler-rt/trunk/lib/asan/Makefile.old
compiler-rt/trunk/lib/asan/asan_internal.h
compiler-rt/trunk/lib/asan/asan_linux.cc
compiler-rt/trunk/lib/asan/asan_mac.cc
compiler-rt/trunk/lib/asan/asan_mac.h
compiler-rt/trunk/lib/asan/asan_malloc_linux.cc
compiler-rt/trunk/lib/asan/asan_malloc_mac.cc
compiler-rt/trunk/lib/asan/asan_rtl.cc
compiler-rt/trunk/lib/asan/mach_override/mach_override.c
compiler-rt/trunk/lib/asan/mach_override/mach_override.h
Modified: compiler-rt/trunk/lib/asan/Makefile.old
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.old?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.old (original)
+++ compiler-rt/trunk/lib/asan/Makefile.old Thu Dec 1 15:40:52 2011
@@ -7,7 +7,6 @@
#
#===------------------------------------------------------------------------===#
-SVNVERSION=$(shell svnversion)
OS=$(shell uname | tr '[A-Z]' '[a-z]')
ROOT=$(shell pwd)
MAKEFILE=Makefile.old # this file.
@@ -169,44 +168,38 @@
ASAN_LD_TAIL=$(LIBASAN_A)
endif
-RTL_HDR_COMMON=asan_allocator.h \
+RTL_HDR=asan_allocator.h \
asan_internal.h \
asan_interceptors.h \
asan_interface.h \
asan_lock.h \
+ asan_mac.h \
asan_mapping.h \
asan_stack.h \
asan_stats.h \
asan_thread.h \
asan_thread_registry.h \
+ mach_override/mach_override.h \
sysinfo/basictypes.h \
sysinfo/sysinfo.h
-LIBASAN_OBJ_COMMON=$(BIN)/asan_rtl$(SUFF).o \
+LIBASAN_OBJ=$(BIN)/asan_rtl$(SUFF).o \
$(BIN)/asan_allocator$(SUFF).o \
$(BIN)/asan_globals$(SUFF).o \
$(BIN)/asan_interceptors$(SUFF).o \
+ $(BIN)/asan_linux$(SUFF).o \
+ $(BIN)/asan_mac$(SUFF).o \
+ $(BIN)/asan_malloc_linux$(SUFF).o \
+ $(BIN)/asan_malloc_mac$(SUFF).o \
$(BIN)/asan_poisoning$(SUFF).o \
$(BIN)/asan_printf$(SUFF).o \
$(BIN)/asan_stack$(SUFF).o \
$(BIN)/asan_stats$(SUFF).o \
$(BIN)/asan_thread$(SUFF).o \
$(BIN)/asan_thread_registry$(SUFF).o \
+ $(BIN)/mach_override/mach_override$(SUFF).o \
$(BIN)/sysinfo/sysinfo$(SUFF).o
-ifeq ($(OS),darwin)
-RTL_HDR=$(RTL_HDR_COMMON) mach_override/mach_override.h asan_mac.h
-LIBASAN_OBJ=$(LIBASAN_OBJ_COMMON) \
- $(BIN)/asan_mac$(SUFF).o \
- $(BIN)/asan_malloc_mac$(SUFF).o \
- $(BIN)/mach_override/mach_override$(SUFF).o
-else
-RTL_HDR=$(RTL_HDR_COMMON)
-LIBASAN_OBJ=$(LIBASAN_OBJ_COMMON) \
- $(BIN)/asan_linux$(SUFF).o \
- $(BIN)/asan_malloc_linux$(SUFF).o
-endif
-
GTEST_ROOT=third_party/googletest
GTEST_INCLUDE=-I$(GTEST_ROOT)/include
GTEST_MAKE_DIR=$(GTEST_ROOT)/make-$(OS)$(SUFF)
@@ -269,7 +262,6 @@
$(BIN)/%$(SUFF).o: %.cc $(RTL_HDR) $(MAKEFILE)
$(CXX) $(PIE) $(CFLAGS) -fPIC -c -o $@ -g $< -Ithird_party \
- -DASAN_REVISION=\"$(SVNVERSION)\" \
-DASAN_USE_SYSINFO=1 \
-DASAN_NEEDS_SEGV=$(ASAN_NEEDS_SEGV) \
-DASAN_HAS_EXCEPTIONS=$(ASAN_HAS_EXCEPTIONS) \
@@ -278,7 +270,6 @@
$(BIN)/%$(SUFF).o: %.c $(RTL_HDR) $(MAKEFILE)
$(CC) $(PIE) $(CFLAGS) -fPIC -c -o $@ -g $< -Ithird_party \
- -DASAN_REVISION=\"$(SVNVERSION)\" \
-DASAN_USE_SYSINFO=1 \
$(ASAN_FLAGS)
Modified: compiler-rt/trunk/lib/asan/asan_internal.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_internal.h (original)
+++ compiler-rt/trunk/lib/asan/asan_internal.h Thu Dec 1 15:40:52 2011
@@ -14,6 +14,10 @@
#ifndef ASAN_INTERNAL_H
#define ASAN_INTERNAL_H
+#if !defined(__linux__) && !defined(__APPLE__)
+# error "This operating system is not supported by AddressSanitizer"
+#endif
+
#include <stdint.h> // for __WORDSIZE
#include <stdlib.h> // for size_t
#include <unistd.h> // for _exit
Modified: compiler-rt/trunk/lib/asan/asan_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_linux.cc?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_linux.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_linux.cc Thu Dec 1 15:40:52 2011
@@ -11,6 +11,7 @@
//
// Linux-specific details.
//===----------------------------------------------------------------------===//
+#ifdef __linux__
#include "asan_internal.h"
@@ -46,3 +47,5 @@
}
} // namespace __asan
+
+#endif // __linux__
Modified: compiler-rt/trunk/lib/asan/asan_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mac.cc?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_mac.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_mac.cc Thu Dec 1 15:40:52 2011
@@ -12,9 +12,7 @@
// Mac-specific details.
//===----------------------------------------------------------------------===//
-#ifndef __APPLE__
-#error "This file should be used on Mac OS X only."
-#endif
+#ifdef __APPLE__
#include "asan_mac.h"
@@ -254,3 +252,5 @@
return real_pthread_workqueue_additem_np(workq, wrap_workitem_func, asan_ctxt,
itemhandlep, gencountp);
}
+
+#endif // __APPLE__
Modified: compiler-rt/trunk/lib/asan/asan_mac.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mac.h?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_mac.h (original)
+++ compiler-rt/trunk/lib/asan/asan_mac.h Thu Dec 1 15:40:52 2011
@@ -11,6 +11,8 @@
//
// ASan-private header for asan_mac.cc
//===----------------------------------------------------------------------===//
+#ifdef __APPLE__
+
#ifndef ASAN_MAC_H
#define ASAN_MAC_H
@@ -81,3 +83,5 @@
}
#endif // ASAN_MAC_H
+
+#endif // __APPLE__
Modified: compiler-rt/trunk/lib/asan/asan_malloc_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_linux.cc?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_malloc_linux.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_malloc_linux.cc Thu Dec 1 15:40:52 2011
@@ -13,6 +13,7 @@
// We simply define functions like malloc, free, realloc, etc.
// They will replace the corresponding libc functions automagically.
//===----------------------------------------------------------------------===//
+#ifdef __linux__
#include "asan_allocator.h"
#include "asan_interceptors.h"
@@ -137,3 +138,5 @@
return asan_pvalloc(size, &stack);
}
} // extern "C"
+
+#endif // __linux__
Modified: compiler-rt/trunk/lib/asan/asan_malloc_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_mac.cc?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_malloc_mac.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_malloc_mac.cc Thu Dec 1 15:40:52 2011
@@ -12,6 +12,8 @@
// Mac-specific malloc interception.
//===----------------------------------------------------------------------===//
+#ifdef __APPLE__
+
#include <AvailabilityMacros.h>
#include <CoreFoundation/CFBase.h>
#include <malloc/malloc.h>
@@ -378,3 +380,5 @@
}
}
} // namespace __asan
+
+#endif // __APPLE__
Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Thu Dec 1 15:40:52 2011
@@ -753,6 +753,6 @@
__asan_force_interface_symbols(); // no-op.
if (FLAG_v) {
- Report("AddressSanitizer r%s Init done ***\n", ASAN_REVISION);
+ Report("AddressSanitizer Init done\n");
}
}
Modified: compiler-rt/trunk/lib/asan/mach_override/mach_override.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/mach_override/mach_override.c?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/mach_override/mach_override.c (original)
+++ compiler-rt/trunk/lib/asan/mach_override/mach_override.c Thu Dec 1 15:40:52 2011
@@ -5,6 +5,8 @@
***************************************************************************/
+#ifdef __APPLE__
+
#include "mach_override.h"
#include <mach-o/dyld.h>
@@ -769,3 +771,5 @@
}
#endif
#endif
+
+#endif // __APPLE__
Modified: compiler-rt/trunk/lib/asan/mach_override/mach_override.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/mach_override/mach_override.h?rev=145631&r1=145630&r2=145631&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/mach_override/mach_override.h (original)
+++ compiler-rt/trunk/lib/asan/mach_override/mach_override.h Thu Dec 1 15:40:52 2011
@@ -42,6 +42,8 @@
***************************************************************************/
+#ifdef __APPLE__
+
#ifndef _mach_override_
#define _mach_override_
@@ -119,3 +121,5 @@
}
#endif
#endif // _mach_override_
+
+#endif // __APPLE__
More information about the llvm-commits
mailing list