[llvm-commits] [llvm-gcc-4.2] r49990 - in /llvm-gcc-4.2/trunk/gcc: config/i386/cygming.h config/i386/darwin.h config/i386/i386.h config/i386/linux.h config/i386/x86-64.h llvm-abi.h

[Duncan Sands]

Author: baldrick
Date: Sun Apr 20 10:45:52 2008
New Revision: 49990

URL: http://llvm.org/viewvc/llvm-project?rev=49990&view=rev
Log:
On x86-64, llvm-i386-target.h was not being pulled
in by tm.h.  Fix this by including it in i386.h and
x86-64.h, rather than adding it to all the 64 bit
OS specific files (linux64.h etc).  Cures PR2239
and the gcc build itself.  While there, fix some
warnings.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h
    llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
    llvm-gcc-4.2/trunk/gcc/config/i386/i386.h
    llvm-gcc-4.2/trunk/gcc/config/i386/linux.h
    llvm-gcc-4.2/trunk/gcc/config/i386/x86-64.h
    llvm-gcc-4.2/trunk/gcc/llvm-abi.h

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h?rev=49990&r1=49989&r2=49990&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h Sun Apr 20 10:45:52 2008
@@ -427,9 +427,6 @@
     }                                                   \
   }
 
-/* Add general target specific stuff */
-#include "llvm-i386-target.h"
-
 /* LLVM LOCAL end */
 
 #endif

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=49990&r1=49989&r2=49990&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h Sun Apr 20 10:45:52 2008
@@ -403,11 +403,3 @@
    used in Mach-O.  */
 #undef MACHO_SYMBOL_FLAG_VARIABLE
 #define MACHO_SYMBOL_FLAG_VARIABLE ((SYMBOL_FLAG_MACH_DEP) << 3)
-/* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
-
-/* Add general target specific stuff */
-#include "llvm-i386-target.h"
-
-/* LLVM LOCAL end */
-#endif

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.h?rev=49990&r1=49989&r2=49990&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/i386.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.h Sun Apr 20 10:45:52 2008
@@ -37,6 +37,10 @@
 /* LLVM LOCAL begin */
 
 #ifdef ENABLE_LLVM
+
+/* Add general target specific stuff */
+#include "llvm-i386-target.h"
+
 /* Register class used for passing given 64bit part of the argument.
    These represent classes as documented by the PS ABI, with the exception
    of SSESF, SSEDF classes, that are basically SSE class, just gcc will

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/linux.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/linux.h?rev=49990&r1=49989&r2=49990&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/linux.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/linux.h Sun Apr 20 10:45:52 2008
@@ -192,12 +192,3 @@
 /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
 #define TARGET_THREAD_SSP_OFFSET	0x14
 #endif
-
-/* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
-
-/* Add general target specific stuff */
-#include "llvm-i386-target.h"
-
-#endif
-/* LLVM LOCAL end */

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/x86-64.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/x86-64.h?rev=49990&r1=49989&r2=49990&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/x86-64.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/x86-64.h Sun Apr 20 10:45:52 2008
@@ -19,6 +19,15 @@
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
+/* LLVM local begin */
+#ifdef ENABLE_LLVM
+
+/* Add general target specific stuff */
+#include "llvm-i386-target.h"
+
+#endif
+/* LLVM local begin */
+
 #undef ASM_COMMENT_START
 #define ASM_COMMENT_START "#"
 

Modified: llvm-gcc-4.2/trunk/gcc/llvm-abi.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-abi.h?rev=49990&r1=49989&r2=49990&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-abi.h (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-abi.h Sun Apr 20 10:45:52 2008
@@ -217,7 +217,7 @@
 
 // getLLVMAggregateTypeForStructReturn - Return LLVM type if TY can be
 // returns as multiple values, otherwise return NULL. This is the default
-// target indepdendent implementation.
+// target independent implementation.
 static const Type* getLLVMAggregateTypeForStructReturn(tree type) {
   return NULL;
 }
@@ -310,7 +310,7 @@
 // LLVM_BUILD_MULTIPLE_RETURN_VALUE - Build multiple return values
 // for the function FN and add them in RETVALS. Each target that
 // supports multiple return value must implement this hook.
-#ifndef LLVM_BUILD_MULTIPLE_RETURN_VALUE(Fn,R,RetVals,B)
+#ifndef LLVM_BUILD_MULTIPLE_RETURN_VALUE
 #define LLVM_BUILD_MULTIPLE_RETURN_VALUE(Fn,R,RetVals,B) \
   llvm_default_build_multiple_return_value((Fn),(R),(RetVals),(B))
 #endif
@@ -324,7 +324,7 @@
 // LLVM_EXTRACT_MULTIPLE_RETURN_VALUE - Extract multiple return value from
 // SRC and assign it to DEST. Each target that supports multiple return
 // value must implement this hook.
-#ifndef LLVM_EXTRACT_MULTIPLE_RETURN_VALUE(Src,Dest,B)
+#ifndef LLVM_EXTRACT_MULTIPLE_RETURN_VALUE
 #define LLVM_EXTRACT_MULTIPLE_RETURN_VALUE(Src,Dest,V,B)     \
   llvm_default_extract_multiple_return_value((Src),(Dest),(V),(B))
 #endif