* config.host (hppa*-*-hpux*): Change out_host_hook_obj and

	host_xmake_file.
	(hppa*-*-linux*): Ditto.
	(ia64-*-hpux*): Add out_host_hook_obj and host_xmake_file.
	config/host-hpux.c: New.
	config/x-hpux: New.
	config/pa/x-hpux: Remove.
	config/pa/x-linux: Remove.
	config/pa/pa-host.c: Remove.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3d619f..a5f0110 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-07  Steve Ellcey  <sje@cup.hp.com>
+
+       * config.host (hppa*-*-hpux*): Change out_host_hook_obj and
+       host_xmake_file.
+       (hppa*-*-linux*): Ditto.
+       (ia64-*-hpux*): Add out_host_hook_obj and host_xmake_file.
+       * config/host-hpux.c: New.
+       * config/x-hpux: New.
+       * config/pa/x-hpux: Remove.
+       * config/pa/x-linux: Remove.
+       * config/pa/pa-host.c: Remove.
+
 2005-10-07  Jeff Law  <law@redhat.com>
 
        * tree-ssa-dom.c (dom_opt_finalize_block): Fix conditions to

diff --git a/gcc/config.host b/gcc/config.host
index 0f804aa..026cd09 100644 (file)
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -122,12 +122,12 @@ case ${host} in
   hppa1.0-*-hpux10* | hppa1.1-*-hpux10* | hppa2*-*-hpux10* | \
   hppa1.0-*-hpux11* | hppa1.1-*-hpux11* | hppa2*-*-hpux11* | \
   hppa*64*-*-hpux11*)
-    out_host_hook_obj=pa-host.o
-    host_xmake_file=pa/x-hpux
+    out_host_hook_obj=host-hpux.o
+    host_xmake_file="pa/x-ada x-hpux"
     ;;
   hppa*-*-linux*)
-    out_host_hook_obj=pa-host.o
-    host_xmake_file=pa/x-linux
+    out_host_hook_obj=host-hpux.o
+    host_xmake_file=x-hpux
     ;;
   i370-*-opened* | i370-*-mvs* ) # IBM 360/370/390 Architecture
     host_xm_defines='FATAL_EXIT_CODE=12'
@@ -194,5 +194,7 @@ case ${host} in
     ;;
   ia64-*-hpux*)
     use_long_long_for_widest_fast_int=yes
+    out_host_hook_obj=host-hpux.o
+    host_xmake_file=x-hpux
     ;;
 esac

diff --git a/gcc/config/pa/pa-host.c b/gcc/config/host-hpux.c
similarity index 86%
rename from gcc/config/pa/pa-host.c
rename to gcc/config/host-hpux.c
index 73f546a..2ca5ba9 100644 (file)
--- a/gcc/config/pa/pa-host.c
+++ b/gcc/config/host-hpux.c
@@ -1,5 +1,5 @@
-/* PA host-specific hook definitions.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+/* HP-UX host-specific hook definitions.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -30,19 +30,19 @@
 #define MAP_FAILED (void *)-1L
 #endif
 
-static void *pa_gt_pch_get_address (size_t, int);
-static int pa_gt_pch_use_address (void *, size_t, int, size_t);
+static void *hpux_gt_pch_get_address (size_t, int);
+static int hpux_gt_pch_use_address (void *, size_t, int, size_t);
 
 #undef HOST_HOOKS_GT_PCH_GET_ADDRESS
-#define HOST_HOOKS_GT_PCH_GET_ADDRESS pa_gt_pch_get_address
+#define HOST_HOOKS_GT_PCH_GET_ADDRESS hpux_gt_pch_get_address
 #undef HOST_HOOKS_GT_PCH_USE_ADDRESS
-#define HOST_HOOKS_GT_PCH_USE_ADDRESS pa_gt_pch_use_address
+#define HOST_HOOKS_GT_PCH_USE_ADDRESS hpux_gt_pch_use_address
 
 /* For various ports, try to guess a fixed spot in the vm space
    that's probably free.  */
-#if defined(__hppa__) && defined(__LP64__)
+#if (defined(__hppa__) || defined(__ia64__)) && defined(__LP64__)
 # define TRY_EMPTY_VM_SPACE    0x8000000000000000
-#elif defined(__hppa__)
+#elif defined(__hppa__) || defined(__ia64__)
 # define TRY_EMPTY_VM_SPACE    0x60000000
 #else
 # define TRY_EMPTY_VM_SPACE    0
@@ -53,7 +53,7 @@ static int pa_gt_pch_use_address (void *, size_t, int, size_t);
    file unmapped.  */
 
 static void *
-pa_gt_pch_get_address (size_t size, int fd)
+hpux_gt_pch_get_address (size_t size, int fd)
 {
   void *addr;
 
@@ -85,7 +85,7 @@ pa_gt_pch_get_address (size_t size, int fd)
    little else we can do given the current PCH implementation.  */
 
 static int
-pa_gt_pch_use_address (void *base, size_t size, int fd, size_t offset)
+hpux_gt_pch_use_address (void *base, size_t size, int fd, size_t offset)
 {
   void *addr;
 

diff --git a/gcc/config/pa/x-hpux b/gcc/config/pa/x-hpux
deleted file mode 100644 (file)
index 2f16d31..0000000
--- a/gcc/config/pa/x-hpux
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
-
-pa-host.o : $(srcdir)/config/pa/pa-host.c $(CONFIG_H) $(SYSTEM_H) \
-  coretypes.h hosthooks.h hosthooks-def.h $(HOOKS_H)
-       $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-               $(srcdir)/config/pa/pa-host.c

diff --git a/gcc/config/pa/x-linux b/gcc/config/x-hpux
similarity index 51%
rename from gcc/config/pa/x-linux
rename to gcc/config/x-hpux
index 8a5bc6f..fa0c555 100644 (file)
--- a/gcc/config/pa/x-linux
+++ b/gcc/config/x-hpux
@@ -1,4 +1,4 @@
-pa-host.o : $(srcdir)/config/pa/pa-host.c $(CONFIG_H) $(SYSTEM_H) \
+host-hpux.o : $(srcdir)/config/host-hpux.c $(CONFIG_H) $(SYSTEM_H) \
   coretypes.h hosthooks.h hosthooks-def.h $(HOOKS_H)
        $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-               $(srcdir)/config/pa/pa-host.c
+               $(srcdir)/config/host-hpux.c