[llvm-commits] [llvm-gcc-4.2] r41677 - in /llvm-gcc-4.2/trunk/gcc: config/darwin-c.c config/darwin-protos.h config/darwin.h objc/objc-act.c
Anton Korobeynikov
asl at math.spbu.ru
Sun Sep 2 15:22:45 PDT 2007
Author: asl
Date: Sun Sep 2 17:22:45 2007
New Revision: 41677
URL: http://llvm.org/viewvc/llvm-project?rev=41677&view=rev
Log:
Unbreak building of objc FE on non-darwin. Just moved some apple local stuff into proper places :)
Modified:
llvm-gcc-4.2/trunk/gcc/config/darwin-c.c
llvm-gcc-4.2/trunk/gcc/config/darwin-protos.h
llvm-gcc-4.2/trunk/gcc/config/darwin.h
llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
Modified: llvm-gcc-4.2/trunk/gcc/config/darwin-c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin-c.c?rev=41677&r1=41676&r2=41677&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin-c.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin-c.c Sun Sep 2 17:22:45 2007
@@ -1071,13 +1071,3 @@
return true;
}
/* APPLE LOCAL end radar 4985544 - radar 5096648 - radar 5195402 */
-
-/* APPLE LOCAL begin radar 2996215 */
-/* Objc wrapper to call libcpp's conversion routine. */
-bool
-objc_cvt_utf8_utf16 (const unsigned char *inbuf, size_t length,
- unsigned char **uniCharBuf, size_t *numUniChars)
-{
- return cpp_utf8_utf16 (parse_in, inbuf, length, uniCharBuf, numUniChars);
-}
-/* APPLE LOCAL end radar 2996215 */
Modified: llvm-gcc-4.2/trunk/gcc/config/darwin-protos.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin-protos.h?rev=41677&r1=41676&r2=41677&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin-protos.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin-protos.h Sun Sep 2 17:22:45 2007
@@ -134,7 +134,6 @@
/* APPLE LOCAL begin radar 2996215 */
extern tree objc_create_init_utf16_var (const unsigned char *, size_t, size_t *);
-extern bool objc_cvt_utf8_utf16 (const unsigned char *, size_t, unsigned char **, size_t *);
/* APPLE LOCAL end radar 2996215 */
/* APPLE LOCAL radar 5202926 */
extern bool objc_anonymous_local_objc_name (const char *);
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=41677&r1=41676&r2=41677&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Sun Sep 2 17:22:45 2007
@@ -694,6 +694,20 @@
error ("Mac OS X version 10.5 or later is needed for zerocost-exceptions"); \
} while (0)
/* APPLE LOCAL end radar 5023725 */
+
+/* LLVM LOCAL begin */
+/* APPLE LOCAL begin radar 4590191 */
+#undef OBJC_FLAG_SJLJ_EXCEPTIONS
+#define OBJC_FLAG_SJLJ_EXCEPTIONS \
+ do { \
+ if (darwin_macosx_version_min \
+ && strverscmp (darwin_macosx_version_min, "10.3") < 0) \
+ warning (0, "Mac OS X version 10.3 or later is needed instead of %s for objc/obj-c++ exceptions", \
+ darwin_macosx_version_min); \
+ } while(0)
+/* APPLE LOCAL end radar 4590191 */
+/* LLVM LOCAL end */
+
/* APPLE LOCAL begin radar 4862848 */
#undef OBJC_FLAG_OBJC_ABI
#define OBJC_FLAG_OBJC_ABI \
Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=41677&r1=41676&r2=41677&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Sun Sep 2 17:22:45 2007
@@ -123,6 +123,13 @@
#define OBJC_FLAG_ZEROCOST_EXCEPTIONS
#endif
/* APPLE LOCAL end radar 5023725 */
+/* LLVM LOCAL begin */
+/* APPLE LOCAL begin radar 4590191 */
+#ifndef OBJC_FLAG_SJLJ_EXCEPTIONS
+#define OBJC_FLAG_SJLJ_EXCEPTIONS
+#endif
+/* APPLE LOCAL end radar 4590191 */
+/* LLVM LOCAL end */
/* APPLE LOCAL begin radar 4531086 */
#ifndef OBJC_WARN_OBJC2_FEATURES
#define OBJC_WARN_OBJC2_FEATURES(MESSAGE)
@@ -7541,10 +7548,9 @@
/* APPLE LOCAL begin radar 4590191 */
if (flag_objc_sjlj_exceptions)
{
- if (darwin_macosx_version_min
- && strverscmp (darwin_macosx_version_min, "10.3") < 0)
- warning (0, "Mac OS X version 10.3 or later is needed instead of %s for objc/obj-c++ exceptions",
- darwin_macosx_version_min);
+ /* LLVM LOCAL begin */
+ OBJC_FLAG_SJLJ_EXCEPTIONS;
+ /* LLVM LOCAL end */
}
/* APPLE LOCAL end radar 4590191 */
/* APPLE LOCAL begin radar 2848255 */
@@ -17855,7 +17861,7 @@
set_user_assembler_name(decl, string);
/* Let optimizer know that this decl is not removable. */
DECL_PRESERVE_P (decl) = 1;
-#endif ENABLE_LLVM
+#endif
/* LLVM LOCAL end */
pushdecl (decl);
@@ -17874,7 +17880,7 @@
/* This decl's name is special. Ask llvm to not add leading underscore by
setting it as a user supplied asm name. */
set_user_assembler_name(decl, string);
-#endif ENABLE_LLVM
+#endif
/* LLVM LOCAL end */
/* Force the output of the decl as this forces the reference of the class. */
mark_decl_referenced (decl);
@@ -17958,7 +17964,7 @@
set_user_assembler_name(decl, string);
/* Let optimizer know that this decl is not removable. */
DECL_PRESERVE_P (decl) = 1;
-#endif ENABLE_LLVM
+#endif
/* LLVM LOCAL end */
DECL_INITIAL (decl) = init;
assemble_variable (decl, 1, 0, 0);
@@ -18811,7 +18817,17 @@
}
/* APPLE LOCAL end radar 4985544 - 5195402 */
+/* LLVM LOCAL begin */
/* APPLE LOCAL begin radar 2996215 */
+/* Objc wrapper to call libcpp's conversion routine. */
+static bool
+objc_cvt_utf8_utf16 (const unsigned char *inbuf, size_t length,
+ unsigned char **uniCharBuf, size_t *numUniChars)
+{
+ return cpp_utf8_utf16 (parse_in, inbuf, length, uniCharBuf, numUniChars);
+}
+/* LLVM LOCAL end */
+
/* This routine declares static char __utf16_string [numUniChars] in __TEXT,__ustring
section and initializes it with uniCharBuf[numUniChars] characters.
*/
More information about the llvm-commits
mailing list