Merge from mainline.
llvm-svn: 51417
diff --git a/llvm-gcc-4.2/gcc/config/freebsd-spec.h b/llvm-gcc-4.2/gcc/config/freebsd-spec.h
index 42afd0c..b3f18e2 100644
--- a/llvm-gcc-4.2/gcc/config/freebsd-spec.h
+++ b/llvm-gcc-4.2/gcc/config/freebsd-spec.h
@@ -48,8 +48,6 @@
|| !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \
|| !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
-/* LLVM LOCAL begin */
-#ifndef ENABLE_LLVM
#define FBSD_TARGET_OS_CPP_BUILTINS() \
do \
{ \
@@ -62,32 +60,6 @@
FBSD_TARGET_CPU_CPP_BUILTINS(); \
} \
while (0)
-#else
-#define FBSD_TARGET_OS_CPP_BUILTINS() \
- do \
- { \
- if (FBSD_MAJOR == 7) \
- builtin_define ("__FreeBSD__=7"); \
- else if (FBSD_MAJOR == 6) \
- builtin_define ("__FreeBSD__=6"); \
- else if (FBSD_MAJOR == 5) \
- builtin_define ("__FreeBSD__=5"); \
- else if (FBSD_MAJOR == 4) \
- builtin_define ("__FreeBSD__=4"); \
- else if (FBSD_MAJOR == 3) \
- builtin_define ("__FreeBSD__=3"); \
- else \
- builtin_define ("__FreeBSD__"); \
- builtin_define_std ("unix"); \
- builtin_define ("__KPRINTF_ATTRIBUTE__"); \
- builtin_assert ("system=unix"); \
- builtin_assert ("system=bsd"); \
- builtin_assert ("system=FreeBSD"); \
- FBSD_TARGET_CPU_CPP_BUILTINS(); \
- } \
- while (0)
-#endif
-/* LLVM LOCAL end */
/* Define the default FreeBSD-specific per-CPU hook code. */
#define FBSD_TARGET_CPU_CPP_BUILTINS() do {} while (0)
