This fixes bootstrap on PA HP-UX following libgcc build reorganization.
I also simplified the rules to make them the same for 32 and 64-bit
builds.
Tested on hppa2.0w-hp-hpux11.11 and hppa64-hp-hpux11.11. Committed to
trunk.
Dave
--
J. David Anglin dave.ang...@nrc-cnrc.gc.ca
National Research Council of Canada (613) 990-0752 (FAX: 952-6602)
2011-11-13 John David Anglin <dave.ang...@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.
Index: config.host
===================================================================
--- config.host (revision 181337)
+++ config.host (working copy)
@@ -486,7 +486,7 @@
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: config/pa/t-stublib
===================================================================
--- config/pa/t-stublib (revision 181337)
+++ config/pa/t-stublib (working copy)
@@ -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 @@
libgcc_stub.a: $(LIBGCCSTUB_OBJS)
-rm -rf $@
- $(AR) rc $@ $<
+ $(AR) rc $@ $(LIBGCCSTUB_OBJS)
$(RANLIB) $@
