[llvm-commits] [llvm-gcc-4.2] r100680 - in /llvm-gcc-4.2/trunk/gcc: config/darwin.c config/darwin.h config/i386/darwin.h config/i386/darwin64.h opts.c
Bill Wendling
isanbard at gmail.com
Wed Apr 7 12:43:16 PDT 2010
Author: void
Date: Wed Apr 7 14:43:16 2010
New Revision: 100680
URL: http://llvm.org/viewvc/llvm-project?rev=100680&view=rev
Log:
Revert r100679. Too soon.
Modified:
llvm-gcc-4.2/trunk/gcc/config/darwin.c
llvm-gcc-4.2/trunk/gcc/config/darwin.h
llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
llvm-gcc-4.2/trunk/gcc/config/i386/darwin64.h
llvm-gcc-4.2/trunk/gcc/opts.c
Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.c?rev=100680&r1=100679&r2=100680&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.c Wed Apr 7 14:43:16 2010
@@ -2712,9 +2712,16 @@
void
darwin_override_options (void)
{
- /* LLVM LOCAL begin 7563705 */
- /* Removed. */
- /* LLVM LOCAL begin 7563705 */
+ /* APPLE LOCAL begin for iframework for 4.3 4094959 */
+ /* Remove this: */
+#if 0
+ if (flag_apple_kext && strcmp (lang_hooks.name, "GNU C++") != 0)
+ {
+ warning (0, "command line option %<-fapple-kext%> is only valid for C++");
+ flag_apple_kext = 0;
+ }
+#endif
+ /* APPLE LOCAL end for iframework for 4.3 4094959 */
if (flag_mkernel || flag_apple_kext)
{
/* -mkernel implies -fapple-kext for C++ */
@@ -2734,14 +2741,6 @@
! TARGET_SUPPORTS_KEXTABI1)
flag_apple_kext = 2;
/* APPLE LOCAL end kext v2 */
- /* LLVM LOCAL begin 7563705 */
-#ifdef ENABLE_LLVM
- if (flag_apple_kext
- && strverscmp (darwin_macosx_version_min, "10.6") > 0
- && ! TARGET_64BIT)
- target_flags |= MASK_MACHO_DYNAMIC_NO_PIC;
-#endif
- /* LLVM LOCAL end 7563705 */
}
/* APPLE LOCAL begin axe stubs 5571540 */
/* APPLE LOCAL begin ARM 5683689 */
Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.h?rev=100680&r1=100679&r2=100680&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Wed Apr 7 14:43:16 2010
@@ -240,17 +240,6 @@
darwin_init_cfstring_builtins (); \
} while(0)
-/* LLVM LOCAL begin 7563705 */
-#ifdef ENABLE_LLVM
-#define ALLOW_FAPPLE_KEXT_FLAG \
- (strcmp (lang_hooks.name, "GNU C++") == 0 || \
- (strcmp (lang_hooks.name, "GNU C") == 0 && \
- strverscmp (darwin_macosx_version_min, "10.6") > 0))
-#else
-#define ALLOW_FAPPLE_KEXT_FLAG false
-#endif
-/* LLVM LOCAL end 7563705 */
-
#undef TARGET_EXPAND_TREE_BUILTIN
#define TARGET_EXPAND_TREE_BUILTIN darwin_expand_tree_builtin
#undef TARGET_CONSTRUCT_OBJC_STRING
@@ -604,16 +593,10 @@
/* Default Darwin ASM_SPEC, very simple. */
/* APPLE LOCAL begin kext weak_import 5935650 */
/* APPLE LOCAL begin radar 4161346 */
-/* LLVM LOCAL begin 7563705 */
#define ASM_SPEC "-arch %(darwin_arch) \
- %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \
- %{!Zforce_cpusubtype_ALL:%{faltivec:-force_cpusubtype_ALL}} \
- %{!m64: \
- %{!fapple-kext:%{mkernel|static:-static}} \
- %{fapple-kext: \
- %:version-compare(>= 10.7 mmacosx-version-min= -dynamic) \
- %:version-compare(< 10.7 mmacosx-version-min= -static)}}"
-/* LLVM LOCAL end 7563705 */
+ %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \
+ %{!Zforce_cpusubtype_ALL:%{faltivec:-force_cpusubtype_ALL}} \
+ %{mkernel|static|fapple-kext:%{!Zdynamic:-static}}"
/* APPLE LOCAL end radar 4161346 */
/* APPLE LOCAL end kext weak_import 5935650 */
/* APPLE LOCAL begin mainline 4.3 2006-10-31 4370143 */
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h?rev=100680&r1=100679&r2=100680&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h Wed Apr 7 14:43:16 2010
@@ -113,14 +113,8 @@
/* APPLE LOCAL begin mainline */
#undef ASM_SPEC
/* APPLE LOCAL begin kext weak_import 5935650 */
-/* LLVM LOCAL begin 7563705 */
#define ASM_SPEC "-arch %(darwin_arch) -force_cpusubtype_ALL \
- %{!m64: \
- %{!fapple-kext:%{mkernel|static:-static}} \
- %{fapple-kext: \
- %:version-compare(>= 10.7 mmacosx-version-min= -dynamic) \
- %:version-compare(< 10.7 mmacosx-version-min= -static)}}"
-/* LLVM LOCAL end 7563705 */
+ %{mkernel|static|fapple-kext:%{!m64:-static}}"
/* APPLE LOCAL end kext weak_import 5935650 */
#define DARWIN_ARCH_SPEC "%{m64:x86_64;:i386}"
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/darwin64.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/darwin64.h?rev=100680&r1=100679&r2=100680&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/darwin64.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin64.h Wed Apr 7 14:43:16 2010
@@ -30,14 +30,8 @@
/* APPLE LOCAL begin kext 6400713 */
#undef ASM_SPEC
-/* LLVM LOCAL begin 7563705 */
-#define ASM_SPEC "-arch %(darwin_arch) -force_cpusubtype_ALL \
- %{!m64: \
- %{!fapple-kext:%{mkernel|static:-static}} \
- %{fapple-kext: \
- %:version-compare(>= 10.7 mmacosx-version-min= -dynamic) \
- %:version-compare(< 10.7 mmacosx-version-min= -static)}}"
-/* LLVM LOCAL end 7563705 */
+#define ASM_SPEC "-arch %(darwin_arch) -force_cpusubtype_ALL \
+ %{mkernel|static|fapple-kext:%{m32:-static}}"
/* APPLE LOCAL end kext 6400713 */
#undef SUBTARGET_EXTRA_SPECS
Modified: llvm-gcc-4.2/trunk/gcc/opts.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/opts.c?rev=100680&r1=100679&r2=100680&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/opts.c (original)
+++ llvm-gcc-4.2/trunk/gcc/opts.c Wed Apr 7 14:43:16 2010
@@ -282,14 +282,7 @@
/* APPLE LOCAL begin iframework for 4.3 4094959 */
else if ((option->flags & CL_TARGET)
&& (option->flags & CL_LANG_ALL)
- /* LLVM LOCAL begin 7563705 */
- && !(option->flags & lang_mask)
-#ifdef ALLOW_FAPPLE_KEXT_FLAG
- && (strcmp (*argv, "-fapple-kext") != 0 ||
- ! ALLOW_FAPPLE_KEXT_FLAG)
-#endif
- )
- /* LLVM LOCAL end 7563705 */
+ && !(option->flags & lang_mask))
{
/* Complain for target flag language mismatches if any languages
are specified. */
More information about the llvm-commits
mailing list