[llvm-commits] CVS: gcc-3.4/gcc/llvm-expand.c

[Chris Lattner]

Changes in directory gcc-3.4/gcc:

llvm-expand.c updated: 1.13 -> 1.14

---
Log message:

Don't emit calls to builtin_X, emit calls to X


---
Diffs of the changes:  (+7 -1)

Index: gcc-3.4/gcc/llvm-expand.c
diff -u gcc-3.4/gcc/llvm-expand.c:1.13 gcc-3.4/gcc/llvm-expand.c:1.14
--- gcc-3.4/gcc/llvm-expand.c:1.13	Fri Feb 20 11:17:28 2004
+++ gcc-3.4/gcc/llvm-expand.c	Fri Feb 20 13:08:37 2004
@@ -6399,8 +6399,14 @@
   PFnTy = llvm_type_get_pointer(FnTy);
 
   if (!DECL_LLVM_SET_P(subr) || DECL_LLVM(subr)->Ty != PFnTy) {
-    const char *ExternalName = IDENTIFIER_POINTER(DECL_NAME(subr));
+    const char *ExternalName = IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(subr));
     llvm_value *GlobalVal = llvm_get_global_alias(ExternalName);
+    if (!GlobalVal) {
+      ExternalName = IDENTIFIER_POINTER(DECL_NAME(subr));
+      GlobalVal = llvm_get_global_alias(ExternalName);
+      if (!GlobalVal)
+        ExternalName = IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(subr));
+    }
     if (!GlobalVal || GlobalVal->Ty != PFnTy) {
       const char *PName = (*lang_hooks.decl_printable_name)(subr, 2);