Fix HPUX libgcc_s.so linking problem.

	* config/ia64/ia64.h: Delete obsolete lib1funcs.asm comment.
        * config/ia64/t-ia64: Change LIB1ASMFUNCS to use single underscore.
        * config/ia64/lib1funcs.asm: Change macro names to match t-ia64.

From-SVN: r43700

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ec3252cfbb3ec49161d9a050c40a9d54faaabbff..7d9bb7dd3c6f4c0911748a6ce7cbf2328ff94363 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-02  Jim Wilson  <wilson@redhat.com>
+
+       * config/ia64/ia64.h: Delete obsolete lib1funcs.asm comment.
+
+2001-07-02  Steve Ellcey  <sje@cup.hp.com>
+
+        * config/ia64/t-ia64: Change LIB1ASMFUNCS to use single underscore.
+        * config/ia64/lib1funcs.asm: Change macro names to match t-ia64.
+
 2001-07-02  Zack Weinberg  <zackw@stanford.edu>
 
        * cppinit.c (lang_defaults): New table.

diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index cb2747e3571522f2f159b2bd6d92af650bac7cdb..5a89629fa49cbbe66bda3a7f56768f5bb877dc8f 100644 (file)
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -1698,12 +1698,6 @@ do {                                                                     \
 \f
 /* Implicit Calls to Library Routines */
 
-/* ??? The ia64 linux kernel requires that we use the standard names for
-   divide and modulo routines.  However, if we aren't careful, lib1funcs.asm
-   will be overridden by libgcc2.c.  We avoid this by using different names
-   for lib1funcs.asm modules, e.g. __divdi3 vs _divdi3.  Since lib1funcs.asm
-   goes into libgcc.a first, the linker will find it first.  */
-
 /* Define this macro if GNU CC should generate calls to the System V (and ANSI
    C) library functions `memcpy' and `memset' rather than the BSD functions
    `bcopy' and `bzero'.  */

diff --git a/gcc/config/ia64/lib1funcs.asm b/gcc/config/ia64/lib1funcs.asm
index 75e79b0a0f73e7044909ffc44697fcb8a3b31142..a69cef2713f0f42ff7538ebfa17986d124b73970 100644 (file)
--- a/gcc/config/ia64/lib1funcs.asm
+++ b/gcc/config/ia64/lib1funcs.asm
@@ -1,4 +1,4 @@
-#ifdef L__divtf3
+#ifdef L_divtf3
 // Compute a 80-bit IEEE double-extended quotient.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -40,7 +40,7 @@ __divtf3:
        .endp __divtf3
 #endif
 
-#ifdef L__divdf3
+#ifdef L_divdf3
 // Compute a 64-bit IEEE double quotient.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -82,7 +82,7 @@ __divdf3:
        .endp __divdf3
 #endif
 
-#ifdef L__divsf3
+#ifdef L_divsf3
 // Compute a 32-bit IEEE float quotient.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -118,7 +118,7 @@ __divsf3:
        .endp __divsf3
 #endif
 
-#ifdef L__divdi3
+#ifdef L_divdi3
 // Compute a 64-bit integer quotient.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -168,7 +168,7 @@ __divdi3:
        .endp __divdi3
 #endif
 
-#ifdef L__moddi3
+#ifdef L_moddi3
 // Compute a 64-bit integer modulus.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -222,7 +222,7 @@ __moddi3:
        .endp __moddi3
 #endif
 
-#ifdef L__udivdi3
+#ifdef L_udivdi3
 // Compute a 64-bit unsigned integer quotient.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -272,7 +272,7 @@ __udivdi3:
        .endp __udivdi3
 #endif
 
-#ifdef L__umoddi3
+#ifdef L_umoddi3
 // Compute a 64-bit unsigned integer modulus.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -327,7 +327,7 @@ __umoddi3:
        .endp __umoddi3
 #endif
 
-#ifdef L__divsi3
+#ifdef L_divsi3
 // Compute a 32-bit integer quotient.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -370,7 +370,7 @@ __divsi3:
        .endp __divsi3
 #endif
 
-#ifdef L__modsi3
+#ifdef L_modsi3
 // Compute a 32-bit integer modulus.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -417,7 +417,7 @@ __modsi3:
        .endp __modsi3
 #endif
 
-#ifdef L__udivsi3
+#ifdef L_udivsi3
 // Compute a 32-bit unsigned integer quotient.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -460,7 +460,7 @@ __udivsi3:
        .endp __udivsi3
 #endif
 
-#ifdef L__umodsi3
+#ifdef L_umodsi3
 // Compute a 32-bit unsigned integer modulus.
 //
 // From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -507,7 +507,7 @@ __umodsi3:
        .endp __umodsi3
 #endif
 
-#ifdef L__save_stack_nonlocal
+#ifdef L_save_stack_nonlocal
 // Notes on save/restore stack nonlocal: We read ar.bsp but write
 // ar.bspstore.  This is because ar.bsp can be read at all times
 // (independent of the RSE mode) but since it's read-only we need to
@@ -556,7 +556,7 @@ __ia64_save_stack_nonlocal:
        .endp __ia64_save_stack_nonlocal
 #endif
 
-#ifdef L__nonlocal_goto
+#ifdef L_nonlocal_goto
 // void __ia64_nonlocal_goto(void *target_label, void *save_area,
 //                          void *static_chain);
 
@@ -609,7 +609,7 @@ __ia64_nonlocal_goto:
        .endp __ia64_nonlocal_goto
 #endif
 
-#ifdef L__restore_stack_nonlocal
+#ifdef L_restore_stack_nonlocal
 // This is mostly the same as nonlocal_goto above.
 // ??? This has not been tested yet.
 
@@ -662,7 +662,7 @@ __ia64_restore_stack_nonlocal:
        .endp __ia64_restore_stack_nonlocal
 #endif
 
-#ifdef L__trampoline
+#ifdef L_trampoline
 // Implement the nested function trampoline.  This is out of line
 // so that we don't have to bother with flushing the icache, as
 // well as making the on-stack trampoline smaller.

diff --git a/gcc/config/ia64/t-ia64 b/gcc/config/ia64/t-ia64
index 32e507d6db2d16d25cfc4f79acfb5e95c164c2ba..69e2a49ac50608c60e0f8690b6387e38a9fa1e06 100644 (file)
--- a/gcc/config/ia64/t-ia64
+++ b/gcc/config/ia64/t-ia64
@@ -1,12 +1,9 @@
 LIB1ASMSRC    = ia64/lib1funcs.asm
 
-# ??? We change the names of the DImode div/mod files so that they won't
-# accidentally be overridden by libgcc2.c files.  We used to use __ia64 as
-# a prefix, now we use __ as the prefix.
-LIB1ASMFUNCS  = __divtf3 __divdf3 __divsf3 \
-       __divdi3 __moddi3 __udivdi3 __umoddi3 \
-       __divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
-       __nonlocal_goto __restore_stack_nonlocal __trampoline
+LIB1ASMFUNCS  = _divtf3 _divdf3 _divsf3 \
+       _divdi3 _moddi3 _udivdi3 _umoddi3 \
+       _divsi3 _modsi3 _udivsi3 _umodsi3 _save_stack_nonlocal \
+       _nonlocal_goto _restore_stack_nonlocal _trampoline
 
 # ??? Hack to get -P option used when compiling lib1funcs.asm, because Intel
 # assembler does not accept # line number as a comment.