From 0119c7f2645e23ea7bc941636e7df39a06494a98 Mon Sep 17 00:00:00 2001
From: danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 5 Feb 2006 15:54:49 +0000
Subject: [PATCH] * pa/x-ada-hpux10, pa/t-pa-hpux10, pa/t-pa-hpux11: New
files. * config.gcc (hppa[12]*-*-hpux10*): Use pa/t-pa-hpux10 instead
of pa/t-pa. * config.gcc (hppa[12]*-*-hpux11*): Use pa/t-pa-hpux11
instead of pa/t-pa. * config.host (hppa*-*-hpux10*): Use
pa/x-ada-hpux10 instead of pa/x-ada. * pa/t-pa-hpux: Add
lib2funcs.asm and quadlib.c rules. * pa/t-pa64: Delete quadlib.c rule.
* pa/x-ada: Revert last change. * pa/t-pa: Revert last change. Delete
quadlib.c rule.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110615 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 14 ++++++++++++++
gcc/config.gcc | 4 ++--
gcc/config.host | 5 ++++-
gcc/config/pa/t-pa | 14 +++-----------
gcc/config/pa/t-pa-hpux | 8 ++++++++
gcc/config/pa/t-pa-hpux10 | 2 ++
gcc/config/pa/t-pa-hpux11 | 2 ++
gcc/config/pa/t-pa64 | 8 --------
gcc/config/pa/x-ada | 8 +-------
gcc/config/pa/x-ada-hpux10 | 4 ++++
10 files changed, 40 insertions(+), 29 deletions(-)
create mode 100644 gcc/config/pa/t-pa-hpux10
create mode 100644 gcc/config/pa/t-pa-hpux11
create mode 100644 gcc/config/pa/x-ada-hpux10
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4908f5c61376..e8a26efe66d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2006-02-05 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
+
+ * pa/x-ada-hpux10, pa/t-pa-hpux10, pa/t-pa-hpux11: New files.
+ * config.gcc (hppa[12]*-*-hpux10*): Use pa/t-pa-hpux10 instead of
+ pa/t-pa.
+ * config.gcc (hppa[12]*-*-hpux11*): Use pa/t-pa-hpux11 instead of
+ pa/t-pa.
+ * config.host (hppa*-*-hpux10*): Use pa/x-ada-hpux10 instead of
+ pa/x-ada.
+ * pa/t-pa-hpux: Add lib2funcs.asm and quadlib.c rules.
+ * pa/t-pa64: Delete quadlib.c rule.
+ * pa/x-ada: Revert last change.
+ * pa/t-pa: Revert last change. Delete quadlib.c rule.
+
2006-02-04 Zdenek Dvorak <dvorakz@suse.cz>
PR rtl-optimization/26087
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 0ac27c342a59..d4fdac31518a 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -890,7 +890,7 @@ hppa[12]*-*-hpux10*)
extra_options="${extra_options} pa/pa-hpux1010.opt"
;;
esac
- tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
+ tmake_file="pa/t-pa-hpux10 pa/t-pa-hpux pa/t-hpux-shlib"
case ${enable_threads} in
"")
if test x$have_pthread_h = xyes ; then
@@ -967,7 +967,7 @@ hppa[12]*-*-hpux11*)
extra_options="${extra_options} pa/pa-hpux1111.opt"
;;
esac
- tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
+ tmake_file="pa/t-pa-hpux11 pa/t-pa-hpux pa/t-hpux-shlib"
# Set the libgcc version number
if test x$sjlj = x1; then
tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
diff --git a/gcc/config.host b/gcc/config.host
index 8d227dd68f6f..f9b39e682f2b 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -119,7 +119,10 @@ case ${host} in
hppa1.1-*-bsd*)
host_xmake_file="pa/x-ada"
;;
- hppa1.0-*-hpux10* | hppa1.1-*-hpux10* | hppa2*-*-hpux10* | \
+ hppa1.0-*-hpux10* | hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
+ out_host_hook_obj=host-hpux.o
+ host_xmake_file="pa/x-ada-hpux10 x-hpux"
+ ;;
hppa1.0-*-hpux11* | hppa1.1-*-hpux11* | hppa2*-*-hpux11* | \
hppa*64*-*-hpux11*)
out_host_hook_obj=host-hpux.o
diff --git a/gcc/config/pa/t-pa b/gcc/config/pa/t-pa
index 5b1a0f911b31..cad060da0665 100644
--- a/gcc/config/pa/t-pa
+++ b/gcc/config/pa/t-pa
@@ -1,15 +1,7 @@
-LIB2FUNCS_EXTRA=lib2funcs.asm quadlib.c
+TARGET_LIBGCC2_CFLAGS = -fPIC
+
+LIB2FUNCS_EXTRA=lib2funcs.asm
lib2funcs.asm: $(srcdir)/config/pa/lib2funcs.asm
rm -f lib2funcs.asm
cp $(srcdir)/config/pa/lib2funcs.asm .
-
-quadlib.c: $(srcdir)/config/pa/quadlib.c
- rm -f quadlib.c
- cp $(srcdir)/config/pa/quadlib.c .
-
-ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
- TARGET_LIBGCC2_CFLAGS = -fPIC -D_T_HPUX10
-else
- TARGET_LIBGCC2_CFLAGS = -fPIC
-endif
diff --git a/gcc/config/pa/t-pa-hpux b/gcc/config/pa/t-pa-hpux
index 11c28466e76c..1c62f4ee237a 100644
--- a/gcc/config/pa/t-pa-hpux
+++ b/gcc/config/pa/t-pa-hpux
@@ -1,2 +1,10 @@
# So putenv and other functions get seen by fixproto.
FIXPROTO_DEFINES = -D_HPUX_SOURCE -D_HIUX_SOURCE
+
+lib2funcs.asm: $(srcdir)/config/pa/lib2funcs.asm
+ rm -f lib2funcs.asm
+ cp $(srcdir)/config/pa/lib2funcs.asm .
+
+quadlib.c: $(srcdir)/config/pa/quadlib.c
+ rm -f quadlib.c
+ cp $(srcdir)/config/pa/quadlib.c .
diff --git a/gcc/config/pa/t-pa-hpux10 b/gcc/config/pa/t-pa-hpux10
new file mode 100644
index 000000000000..105ef19f365a
--- /dev/null
+++ b/gcc/config/pa/t-pa-hpux10
@@ -0,0 +1,2 @@
+TARGET_LIBGCC2_CFLAGS = -fPIC -D_T_HPUX10
+LIB2FUNCS_EXTRA=lib2funcs.asm quadlib.c
diff --git a/gcc/config/pa/t-pa-hpux11 b/gcc/config/pa/t-pa-hpux11
new file mode 100644
index 000000000000..f36a75cb9c5e
--- /dev/null
+++ b/gcc/config/pa/t-pa-hpux11
@@ -0,0 +1,2 @@
+TARGET_LIBGCC2_CFLAGS = -fPIC
+LIB2FUNCS_EXTRA=lib2funcs.asm quadlib.c
diff --git a/gcc/config/pa/t-pa64 b/gcc/config/pa/t-pa64
index e80406009a65..b302cffca3ff 100644
--- a/gcc/config/pa/t-pa64
+++ b/gcc/config/pa/t-pa64
@@ -1,10 +1,2 @@
TARGET_LIBGCC2_CFLAGS = -fPIC -Dpa64=1 -DELF=1 -mlong-calls
-
LIB2FUNCS_EXTRA=quadlib.c
-
-# We'll need this once .init sections are enabled on PA64.
-#EXTRA_PARTS = crtbegin.o crtend.o
-
-quadlib.c: $(srcdir)/config/pa/quadlib.c
- rm -f quadlib.c
- cp $(srcdir)/config/pa/quadlib.c .
diff --git a/gcc/config/pa/x-ada b/gcc/config/pa/x-ada
index 1e1ba698ec0e..b60b3d7925bf 100644
--- a/gcc/config/pa/x-ada
+++ b/gcc/config/pa/x-ada
@@ -1,10 +1,4 @@
# The ada virtual array implementation requires that indexing be disabled on
# hosts such as hpux that use a segmented memory architecture. Both the c
# and ada files need to be compiled with this option for correct operation.
-# On HP-UX 10 hosts, we define _X_HPUX10 to cause __main () to be called at
-# startup.
-ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
- X_ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10
-else
- X_ADA_CFLAGS = -mdisable-indexing
-endif
+X_ADA_CFLAGS=-mdisable-indexing
diff --git a/gcc/config/pa/x-ada-hpux10 b/gcc/config/pa/x-ada-hpux10
new file mode 100644
index 000000000000..d2b70753088d
--- /dev/null
+++ b/gcc/config/pa/x-ada-hpux10
@@ -0,0 +1,4 @@
+# The ada virtual array implementation requires that indexing be disabled on
+# hosts such as hpux that use a segmented memory architecture. Both the c
+# and ada files need to be compiled with this option for correct operation.
+X_ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10
--
GitLab