OSDN Git Service

* config.host (hppa*64*-*-hpux11*): Remove pa/t-stublib64 from
authordanglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 13 Nov 2011 20:17:01 +0000 (20:17 +0000)
committerdanglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 13 Nov 2011 20:17:01 +0000 (20:17 +0000)
tmake_file list.
* config/pa/t-stublib: Merge rules from config/pa/t-stublib64.
* config/pa/t-stublib64: Delete.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181339 138bc75d-0d04-0410-961f-82ee72b054a4

libgcc/ChangeLog
libgcc/config.host
libgcc/config/pa/t-stublib
libgcc/config/pa/t-stublib64 [deleted file]

index 6e6f79a..c10667b 100644 (file)
@@ -1,3 +1,10 @@
+2011-11-13  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+       * config.host (hppa*64*-*-hpux11*): Remove pa/t-stublib64 from
+       tmake_file list.
+       * config/pa/t-stublib: Merge rules from config/pa/t-stublib64.
+       * config/pa/t-stublib64: Delete.
+
 2011-11-12  Richard Henderson  <rth@redhat.com>
 
        * config/rs6000/linux-unwind.h (frob_update_context): Properly
index 03f94d9..342d60c 100644 (file)
@@ -486,7 +486,7 @@ hppa[12]*-*-hpux10*)
        md_unwind_header=pa/hpux-unwind.h
        ;;
 hppa*64*-*-hpux11*)
-       tmake_file="$tmake_file pa/t-hpux pa/t-pa64 pa/t-stublib pa/t-stublib64 t-libgcc-pic t-slibgcc"
+       tmake_file="$tmake_file pa/t-hpux pa/t-pa64 pa/t-stublib t-libgcc-pic t-slibgcc"
        # Set the libgcc version number
        if test x$enable_sjlj_exceptions = xyes; then
            tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
index 017998f..9438092 100644 (file)
@@ -1,8 +1,21 @@
-LIBGCCSTUB_OBJS = pthread_default_stacksize_np-stub.o \
+LIBGCCSTUB_OBJS = rfi-stub.o dfi-stub.o jvrc-stub.o cxaf-stub.o \
+       pthread_default_stacksize_np-stub.o \
        pthread_mutex_lock-stub.o \
        pthread_mutex_unlock-stub.o \
        pthread_once-stub.o
 
+rfi-stub.o: $(srcdir)/config/pa/stublib.c
+       $(gcc_compile) -c -O2 -DL_register_frame_info $<
+
+dfi-stub.o: $(srcdir)/config/pa/stublib.c
+       $(gcc_compile) -c -O2 -DL_deregister_frame_info $<
+
+cxaf-stub.o: $(srcdir)/config/pa/stublib.c
+       $(gcc_compile) -c -O2 -DL_cxa_finalize $<
+
+jvrc-stub.o: $(srcdir)/config/pa/stublib.c
+       $(gcc_compile) -c -O2 -DL_Jv_RegisterClasses $<
+
 pthread_default_stacksize_np-stub.o: $(srcdir)/config/pa/stublib.c
        $(gcc_compile) -c -O2 -DL_pthread_default_stacksize_np $<
 
@@ -17,5 +30,5 @@ pthread_once-stub.o: $(srcdir)/config/pa/stublib.c
 
 libgcc_stub.a: $(LIBGCCSTUB_OBJS)
        -rm -rf $@
-       $(AR) rc $@ $<
+       $(AR) rc $@ $(LIBGCCSTUB_OBJS)
        $(RANLIB) $@
diff --git a/libgcc/config/pa/t-stublib64 b/libgcc/config/pa/t-stublib64
deleted file mode 100644 (file)
index 5d0d968..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-LIBGCCSTUB_OBJS += rfi-stub.o dfi-stub.o jvrc-stub.o cxaf-stub.o
-
-rfi-stub.o: $(srcdir)/config/pa/stublib.c
-       $(gcc_compile) -c -O2 -DL_register_frame_info $<
-
-dfi-stub.o: $(srcdir)/config/pa/stublib.c
-       $(gcc_compile) -c -O2 -DL_deregister_frame_info $<
-
-cxaf-stub.o: $(srcdir)/config/pa/stublib.c
-       $(gcc_compile) -c -O2 -DL_cxa_finalize $<
-
-jvrc-stub.o: $(srcdir)/config/pa/stublib.c
-       $(gcc_compile) -c -O2 -DL_Jv_RegisterClasses $<