[llvm-commits] [llvm-gcc-4.2] r110302 - in /llvm-gcc-4.2/trunk: ChangeLog.apple build_gcc gcc/ChangeLog.apple gcc/Makefile.in gcc/config.gcc gcc/ginclude/ppc_intrinsics.h gcc/testsuite/ChangeLog.apple gcc/testsuite/gcc.apple/ppc_intrinsics-1.c gcc/testsuite/gcc.apple/ppc_intrinsics-2.c gcc/timevar.c more-hdrs/
Bob Wilson
bob.wilson at apple.com
Wed Aug 4 19:28:12 PDT 2010
Author: bwilson
Date: Wed Aug 4 21:28:12 2010
New Revision: 110302
URL: http://llvm.org/viewvc/llvm-project?rev=110302&view=rev
Log:
Merge changes from Apple's gcc-4.2 to remove "more-hdrs" files.
Added:
llvm-gcc-4.2/trunk/gcc/ginclude/ppc_intrinsics.h
- copied unchanged from r110287, llvm-gcc-4.2/trunk/more-hdrs/ppc_intrinsics.h
Removed:
llvm-gcc-4.2/trunk/more-hdrs/
Modified:
llvm-gcc-4.2/trunk/ChangeLog.apple
llvm-gcc-4.2/trunk/build_gcc
llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
llvm-gcc-4.2/trunk/gcc/Makefile.in
llvm-gcc-4.2/trunk/gcc/config.gcc
llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple
llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-1.c
llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-2.c
llvm-gcc-4.2/trunk/gcc/timevar.c
Modified: llvm-gcc-4.2/trunk/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/ChangeLog.apple?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/ChangeLog.apple Wed Aug 4 21:28:12 2010
@@ -1,3 +1,14 @@
+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/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Wed Aug 4 21:28:12 2010
@@ -583,30 +583,6 @@
done
fi
-# include
-HEADERPATH=$DEST_ROOT/include/gcc/darwin/$MAJ_VERS
-mkdir -p .$HEADERPATH || exit 1
-
-# Some headers are installed from more-hdrs/. They all share
-# one common feature: they shouldn't be installed here. Sometimes,
-# they should be part of FSF GCC and installed from there; sometimes,
-# they should be installed by some completely different package; sometimes,
-# they only exist for codewarrior compatibility and codewarrior should provide
-# its own. We take care not to install the headers if Libc is already
-# providing them.
-cd $SRC_DIR/more-hdrs
-for h in `echo *.h` ; do
- if [ ! -f /usr/include/$h -o -L /usr/include/$h ] ; then
- cp -R $h $DEST_DIR$HEADERPATH/$h || exit 1
- for t in $TARGETS ; do
- THEADERPATH=$DEST_DIR$DEST_ROOT/lib/gcc/${t}-apple-darwin$DARWIN_VERS/$VERS/include
- [ -f $THEADERPATH/$h ] || \
- ln -s ../../../../../include/gcc/darwin/$MAJ_VERS/$h $THEADERPATH/$h || \
- exit 1
- done
- fi
-done
-
# Add extra man page symlinks for 'c++' and for arch-specific names.
MDIR=$DEST_DIR$DEST_ROOT/share/man/man1
if [ $BUILD_CXX -eq 1 ]; then
Modified: llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ChangeLog.apple?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/gcc/ChangeLog.apple Wed Aug 4 21:28:12 2010
@@ -1,3 +1,19 @@
+2010-08-04 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 7982386
+ * config/rs6000/ppc_intrinsics.h: Moved again from here to...
+ * ginclude/ppc_intrinsics.h: ...here.
+ * timevar.c: Update path to ppc_intrinsics.h.
+ * Makefile.in (USER_H): Add ppc_intrinsics.h.
+ * config.gcc: Revert previous change for ppc_intrinsics.h.
+
+2010-07-29 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 7982386
+ * config/rs6000/ppc_intrinsics.h: Moved here from top-level more-hdrs.
+ * config.gcc: Add ppc_intrinsics.h to extra_headers.
+ * timevar.c: Update path to ppc_intrinsics.h.
+
2010-06-28 Jim Grosbach <grosbach at apple.com>
Radar 7449793
Modified: llvm-gcc-4.2/trunk/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/Makefile.in?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/gcc/Makefile.in Wed Aug 4 21:28:12 2010
@@ -371,10 +371,12 @@
# Header files that are made available under the same name
# to programs compiled with GCC.
+# APPLE LOCAL begin ppc_intrinsics.h 7982386
# APPLE LOCAL begin mainline 2007-06-12 2872232
USER_H = $(srcdir)/ginclude/decfloat.h \
$(srcdir)/ginclude/float.h \
$(srcdir)/ginclude/iso646.h \
+ $(srcdir)/ginclude/ppc_intrinsics.h \
$(srcdir)/ginclude/stdarg.h \
$(srcdir)/ginclude/stdbool.h \
$(srcdir)/ginclude/stddef.h \
@@ -382,6 +384,7 @@
$(srcdir)/ginclude/varargs.h \
$(EXTRA_HEADERS)
# APPLE LOCAL end mainline 2007-06-12 2872232
+# APPLE LOCAL end ppc_intrinsics.h 7982386
UNWIND_H = $(srcdir)/unwind-generic.h
Modified: llvm-gcc-4.2/trunk/gcc/config.gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config.gcc?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config.gcc (original)
+++ llvm-gcc-4.2/trunk/gcc/config.gcc Wed Aug 4 21:28:12 2010
@@ -1839,7 +1839,7 @@
*-darwin[0-6]*)
;;
esac
- extra_headers=altivec.h
+ extra_headers="altivec.h"
;;
powerpc64-*-darwin*)
tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
@@ -1847,7 +1847,7 @@
tmake_file="${tmake_file} t-slibgcc-darwin"
extra_options="${extra_options} ${cpu_type}/darwin.opt"
# We're omitting t-darwin8 to avoid building any multilibs
- extra_headers=altivec.h
+ extra_headers="altivec.h"
;;
powerpc*-*-freebsd*)
tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
Modified: llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple Wed Aug 4 21:28:12 2010
@@ -1,3 +1,9 @@
+2010-07-29 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 7982386
+ * gcc.apple/ppc_intrinsics-1.c: Remove -I option to more-hdrs directory.
+ * gcc.apple/ppc_intrinsics-2.c: Likewise.
+
2010-04-02 Fariborz Jahanian <fjahanian at apple.com>
Radar 7591784
Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-1.c?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-1.c Wed Aug 4 21:28:12 2010
@@ -1,4 +1,3 @@
-/* { dg-options "-I ${srcdir}/../../more-hdrs" } */
/* { dg-do compile { target "powerpc*-*-darwin*" } } */
/* Radar 3208244 */
#include "ppc_intrinsics.h"
Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-2.c?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-2.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ppc_intrinsics-2.c Wed Aug 4 21:28:12 2010
@@ -1,4 +1,4 @@
-/* { dg-options "-I ${srcdir}/../../more-hdrs -Wshorten-64-to-32 -Wno-long-long" } */
+/* { dg-options "-Wshorten-64-to-32 -Wno-long-long" } */
/* { dg-do run { target "powerpc*-*-darwin*" } } */
#include "ppc_intrinsics.h"
#include <stdlib.h>
Modified: llvm-gcc-4.2/trunk/gcc/timevar.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/timevar.c?rev=110302&r1=110301&r2=110302&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/timevar.c (original)
+++ llvm-gcc-4.2/trunk/gcc/timevar.c Wed Aug 4 21:28:12 2010
@@ -85,7 +85,7 @@
clock time. Use PPC intrinsics if possible. */
#if defined(__APPLE__) && defined(__POWERPC__) && HAVE_MACH_TIME
#if __POWERPC__
-# include "../more-hdrs/ppc_intrinsics.h"
+# include "ginclude/ppc_intrinsics.h"
# define HAVE_WALL_TIME
# define USE_PPC_INTRINSICS
static inline double
More information about the llvm-commits
mailing list