[llvm-branch-commits] [llvm-gcc-tag] r110749 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5: ./ ChangeLog.apple Makefile.in build_gcc gcc/config/darwin.c gcc/config/darwin.h gcc/config/i386/darwin.h gcc/config/i386/darwin64.h gcc/config/rs6000/t-darwin gcc/opts.c
Bill Wendling
isanbard at gmail.com
Tue Aug 10 16:46:27 PDT 2010
Author: void
Date: Tue Aug 10 18:46:27 2010
New Revision: 110749
URL: http://llvm.org/viewvc/llvm-project?rev=110749&view=rev
Log:
llvmgcc42-2332.4 with changes to test <rdar://problem/7563705>.
Added:
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/ (props changed)
- copied from r110747, llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.4/
Modified:
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/ChangeLog.apple
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/Makefile.in
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/build_gcc
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.c
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.h
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin.h
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin64.h
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/rs6000/t-darwin
llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/opts.c
Propchange: llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 10 18:46:27 2010
@@ -0,0 +1,2 @@
+/llvm/trunk:100565
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,110272
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/ChangeLog.apple?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/ChangeLog.apple (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/ChangeLog.apple Tue Aug 10 18:46:27 2010
@@ -1,3 +1,20 @@
+2010-08-06 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 8277973
+ * Makefile.in (FLAGS_FOR_TARGET): Add $(SYSROOT_CFLAGS_FOR_TARGET).
+ * build_gcc: Configure for powerpc using --with-build-sysroot.
+
+2010-07-29 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 7982386
+ * mode-hdrs: Remove this directory and all its contents.
+ * build_gcc: Stop installing files from more-hdrs.
+
+2010-07-29 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 7982386
+ * more-hdrs/ppc_intrinsics.h: Moved to gcc/config/rs6000.
+
2010-06-28 Jim Grosbach <grosbach at apple.com>
Radar 7449793
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/Makefile.in?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/Makefile.in (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/Makefile.in Tue Aug 10 18:46:27 2010
@@ -308,7 +308,8 @@
# Programs producing files for the TARGET machine
# -----------------------------------------------
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+# APPLE LOCAL 8277973 Add sysroot flag here.
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ $(SYSROOT_CFLAGS_FOR_TARGET)
AR_FOR_TARGET=@AR_FOR_TARGET@
AS_FOR_TARGET=@AS_FOR_TARGET@
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/build_gcc?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/build_gcc (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/build_gcc Tue Aug 10 18:46:27 2010
@@ -118,6 +118,10 @@
NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=/usr/include/c++/$LIBSTDCXX_VERSION"
# LLVM LOCAL end
+# Build against the MacOSX10.5 SDK for PowerPC.
+PPC_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
+PPC_CONFIGFLAGS="$NON_ARM_CONFIGFLAGS --with-build-sysroot=\"$PPC_SYSROOT\""
+
DARWIN_VERS=`uname -r | sed 's/\..*//'`
echo DARWIN_VERS = $DARWIN_VERS
@@ -367,6 +371,8 @@
AS_FOR_TARGET=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-as \
LD_FOR_TARGET=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-ld \
$SRC_DIR/configure $T_CONFIGFLAGS $ARM_CONFIGFLAGS || exit 1
+ elif [ $t = 'powerpc' ] ; then
+ $SRC_DIR/configure $T_CONFIGFLAGS $PPC_CONFIGFLAGS || exit 1
else
$SRC_DIR/configure $T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS || exit 1
fi
@@ -428,6 +434,8 @@
--target=$t-apple-darwin$DARWIN_VERS"
if [ $t = 'arm' ] && [ $h != 'arm' ] ; then
T_CONFIGFLAGS="$T_CONFIGFLAGS $ARM_CONFIGFLAGS"
+ elif [ $t = 'powerpc' ] && [ $h != 'powerpc' ] ; then
+ T_CONFIGFLAGS="$T_CONFIGFLAGS $PPC_CONFIGFLAGS"
else
T_CONFIGFLAGS="$T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS"
fi
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.c?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.c (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.c Tue Aug 10 18:46:27 2010
@@ -2713,16 +2713,9 @@
void
darwin_override_options (void)
{
- /* 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 */
+ /* LLVM LOCAL begin 7563705 */
+ /* Removed. */
+ /* LLVM LOCAL begin 7563705 */
if (flag_mkernel || flag_apple_kext)
{
/* -mkernel implies -fapple-kext for C++ */
@@ -2742,6 +2735,14 @@
! 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/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.h?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/darwin.h Tue Aug 10 18:46:27 2010
@@ -242,6 +242,17 @@
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
@@ -598,10 +609,16 @@
/* 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}} \
- %{mkernel|static|fapple-kext:%{!Zdynamic:-static}}"
+ %{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 */
/* 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/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin.h?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin.h Tue Aug 10 18:46:27 2010
@@ -109,8 +109,14 @@
/* 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 \
- %{mkernel|static|fapple-kext:%{!m64:-static}}"
+ %{!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 */
/* APPLE LOCAL end kext weak_import 5935650 */
#define DARWIN_ARCH_SPEC "%{m64:x86_64;:i386}"
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin64.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin64.h?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin64.h (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/i386/darwin64.h Tue Aug 10 18:46:27 2010
@@ -30,8 +30,14 @@
/* APPLE LOCAL begin kext 6400713 */
#undef ASM_SPEC
-#define ASM_SPEC "-arch %(darwin_arch) -force_cpusubtype_ALL \
- %{mkernel|static|fapple-kext:%{m32:-static}}"
+/* 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 */
/* APPLE LOCAL end kext 6400713 */
#undef SUBTARGET_EXTRA_SPECS
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/rs6000/t-darwin
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/rs6000/t-darwin?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/rs6000/t-darwin (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/config/rs6000/t-darwin Tue Aug 10 18:46:27 2010
@@ -27,7 +27,7 @@
# APPLE LOCAL 5901604 6499452
# LLVM LOCAL begin 8260893
-MULTILIB_EXTRA_OPTS = isysroot/Developer/SDKs/MacOSX10.6.sdk mmacosx-version-min=10.6
+MULTILIB_EXTRA_OPTS = isysroot/Developer/SDKs/MacOSX10.5.sdk mmacosx-version-min=10.5
# LLVM LOCAL end
# Export the _xlq* symbols from darwin-ldouble.c.
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/opts.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/opts.c?rev=110749&r1=110747&r2=110749&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/opts.c (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2332.5/gcc/opts.c Tue Aug 10 18:46:27 2010
@@ -282,7 +282,14 @@
/* APPLE LOCAL begin iframework for 4.3 4094959 */
else if ((option->flags & CL_TARGET)
&& (option->flags & CL_LANG_ALL)
- && !(option->flags & lang_mask))
+ /* 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 */
{
/* Complain for target flag language mismatches if any languages
are specified. */
More information about the llvm-branch-commits
mailing list