[llvm-commits] [llvm-gcc-4.2] r56379 - in /llvm-gcc-4.2/trunk/gcc/config: darwin.c darwin.h

[Evan Cheng]

Author: evancheng
Date: Fri Sep 19 19:38:13 2008
New Revision: 56379

URL: http://llvm.org/viewvc/llvm-project?rev=56379&view=rev
Log:
Use unsigned instead of bool.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin.c
    llvm-gcc-4.2/trunk/gcc/config/darwin.h

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=56379&r1=56378&r2=56379&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.c Fri Sep 19 19:38:13 2008
@@ -2673,23 +2673,23 @@
 /* APPLE LOCAL end radar 4985544 */
 
 /* APPLE LOCAL begin radar 6230142 */
-bool darwin_llvm_override_target_version(const char *triple, char **new_triple) {
+unsigned darwin_llvm_override_target_version(const char *triple, char **new_triple) {
   int len = 0, version = 0;
 
   if (!darwin_macosx_version_min)
-    return false;
+    return 0;
   
   /* Triple string is expected to look something like 'i386-apple-darwin?'. */
   len = strlen (triple);
   if (len < 7)
-    return false;
+    return 0;
   if (strncmp (&triple[len - 7], "darwin", 6) != 0)
     return (char *)triple;
 
   /* llvm-gcc doesn't support pre-10.0 systems. */
   version = strverscmp (darwin_macosx_version_min, "10.0");
   if (version < 0)
-    return false;
+    return 0;
 
   /* 10.0 is darwin4. */
   version += 4;
@@ -2707,7 +2707,7 @@
   (*new_triple)[len-1] = '0' + version;
   (*new_triple)[len] = '\0';
   
-  return true;
+  return 1;
 }
 /* APPLE LOCAL end radar 6230142 */
 #include "gt-darwin.h"

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=56379&r1=56378&r2=56379&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Fri Sep 19 19:38:13 2008
@@ -1567,10 +1567,8 @@
 
 /* APPLE LOCAL begin radar 6230142 */
 /* libgcc2 is strict c90; bool doesn't work. */
-#ifndef IN_LIBGCC2
-extern bool darwin_llvm_override_target_version(const char*, char**);
+extern unsigned darwin_llvm_override_target_version(const char*, char**);
 #define LLVM_OVERRIDE_TARGET_VERSION(T,N)        \
   darwin_llvm_override_target_version(T,N)
-#endif /* IN_LIBGCC2 */
 /* APPLE LOCAL end radar 6230142 */
 #endif /* CONFIG_DARWIN_H */