From: Steve Ellcey Date: Fri, 7 Oct 2005 17:16:31 +0000 (+0000) Subject: config.host (hppa*-*-hpux*): Change out_host_hook_obj and host_xmake_file. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9bff16b865d92c65d324ad8a32d73e11d84db02b;p=gcc.git config.host (hppa*-*-hpux*): Change out_host_hook_obj and host_xmake_file. * 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. From-SVN: r105093 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e3d619f7f04..a5f0110d77b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2005-10-07 Steve Ellcey + + * 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 * tree-ssa-dom.c (dom_opt_finalize_block): Fix conditions to diff --git a/gcc/config.host b/gcc/config.host index 0f804aa543c..026cd09a91d 100644 --- 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/host-hpux.c b/gcc/config/host-hpux.c new file mode 100644 index 00000000000..2ca5ba9bc49 --- /dev/null +++ b/gcc/config/host-hpux.c @@ -0,0 +1,136 @@ +/* HP-UX host-specific hook definitions. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 2, or (at your + option) any later version. + + GCC is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING. If not, write to the + Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA. */ + +#include "config.h" +#include "system.h" +#include "coretypes.h" +#include +#include +#include "hosthooks.h" +#include "hosthooks-def.h" + +#ifndef MAP_FAILED +#define MAP_FAILED (void *)-1L +#endif + +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 hpux_gt_pch_get_address +#undef HOST_HOOKS_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(__ia64__)) && defined(__LP64__) +# define TRY_EMPTY_VM_SPACE 0x8000000000000000 +#elif defined(__hppa__) || defined(__ia64__) +# define TRY_EMPTY_VM_SPACE 0x60000000 +#else +# define TRY_EMPTY_VM_SPACE 0 +#endif + +/* Determine a location where we might be able to reliably allocate + SIZE bytes. FD is the PCH file, though we should return with the + file unmapped. */ + +static void * +hpux_gt_pch_get_address (size_t size, int fd) +{ + void *addr; + + addr = mmap ((void *)TRY_EMPTY_VM_SPACE, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE, fd, 0); + + /* If we failed the map, that means there's *no* free space. */ + if (addr == (void *) MAP_FAILED) + return NULL; + /* Unmap the area before returning. */ + munmap (addr, size); + + return addr; +} + +/* Map SIZE bytes of FD+OFFSET at BASE. Return 1 if we succeeded at + mapping the data at BASE, -1 if we couldn't. + + It's not possibly to reliably mmap a file using MAP_PRIVATE to + a specific START address on either hpux or linux. First we see + if mmap with MAP_PRIVATE works. If it does, we are off to the + races. If it doesn't, we try an anonymous private mmap since the + kernel is more likely to honor the BASE address in anonymous maps. + We then copy the data to the anonymous private map. This assumes + of course that we don't need to change the data in the PCH file + after it is created. + + This approach obviously causes a performance penalty but there is + little else we can do given the current PCH implementation. */ + +static int +hpux_gt_pch_use_address (void *base, size_t size, int fd, size_t offset) +{ + void *addr; + + /* We're called with size == 0 if we're not planning to load a PCH + file at all. This allows the hook to free any static space that + we might have allocated at link time. */ + if (size == 0) + return -1; + + /* Try to map the file with MAP_PRIVATE. */ + addr = mmap (base, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, offset); + + if (addr == base) + return 1; + + if (addr != (void *) MAP_FAILED) + munmap (addr, size); + + /* Try to make an anonymous private mmap at the desired location. */ + addr = mmap (base, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + if (addr != base) + { + if (addr != (void *) MAP_FAILED) + munmap (addr, size); + return -1; + } + + if (lseek (fd, offset, SEEK_SET) == (off_t)-1) + return -1; + + while (size) + { + ssize_t nbytes; + + nbytes = read (fd, base, MIN (size, SSIZE_MAX)); + if (nbytes <= 0) + return -1; + base = (char *) base + nbytes; + size -= nbytes; + } + + return 1; +} + + +const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; diff --git a/gcc/config/pa/pa-host.c b/gcc/config/pa/pa-host.c deleted file mode 100644 index 73f546aef82..00000000000 --- a/gcc/config/pa/pa-host.c +++ /dev/null @@ -1,136 +0,0 @@ -/* PA host-specific hook definitions. - Copyright (C) 2004 Free Software Foundation, Inc. - - This file is part of GCC. - - GCC is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your - option) any later version. - - GCC is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public - License for more details. - - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING. If not, write to the - Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -#include "config.h" -#include "system.h" -#include "coretypes.h" -#include -#include -#include "hosthooks.h" -#include "hosthooks-def.h" - -#ifndef MAP_FAILED -#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); - -#undef HOST_HOOKS_GT_PCH_GET_ADDRESS -#define HOST_HOOKS_GT_PCH_GET_ADDRESS pa_gt_pch_get_address -#undef HOST_HOOKS_GT_PCH_USE_ADDRESS -#define HOST_HOOKS_GT_PCH_USE_ADDRESS pa_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__) -# define TRY_EMPTY_VM_SPACE 0x8000000000000000 -#elif defined(__hppa__) -# define TRY_EMPTY_VM_SPACE 0x60000000 -#else -# define TRY_EMPTY_VM_SPACE 0 -#endif - -/* Determine a location where we might be able to reliably allocate - SIZE bytes. FD is the PCH file, though we should return with the - file unmapped. */ - -static void * -pa_gt_pch_get_address (size_t size, int fd) -{ - void *addr; - - addr = mmap ((void *)TRY_EMPTY_VM_SPACE, size, PROT_READ | PROT_WRITE, - MAP_PRIVATE, fd, 0); - - /* If we failed the map, that means there's *no* free space. */ - if (addr == (void *) MAP_FAILED) - return NULL; - /* Unmap the area before returning. */ - munmap (addr, size); - - return addr; -} - -/* Map SIZE bytes of FD+OFFSET at BASE. Return 1 if we succeeded at - mapping the data at BASE, -1 if we couldn't. - - It's not possibly to reliably mmap a file using MAP_PRIVATE to - a specific START address on either hpux or linux. First we see - if mmap with MAP_PRIVATE works. If it does, we are off to the - races. If it doesn't, we try an anonymous private mmap since the - kernel is more likely to honor the BASE address in anonymous maps. - We then copy the data to the anonymous private map. This assumes - of course that we don't need to change the data in the PCH file - after it is created. - - This approach obviously causes a performance penalty but there is - 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) -{ - void *addr; - - /* We're called with size == 0 if we're not planning to load a PCH - file at all. This allows the hook to free any static space that - we might have allocated at link time. */ - if (size == 0) - return -1; - - /* Try to map the file with MAP_PRIVATE. */ - addr = mmap (base, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, offset); - - if (addr == base) - return 1; - - if (addr != (void *) MAP_FAILED) - munmap (addr, size); - - /* Try to make an anonymous private mmap at the desired location. */ - addr = mmap (base, size, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - - if (addr != base) - { - if (addr != (void *) MAP_FAILED) - munmap (addr, size); - return -1; - } - - if (lseek (fd, offset, SEEK_SET) == (off_t)-1) - return -1; - - while (size) - { - ssize_t nbytes; - - nbytes = read (fd, base, MIN (size, SSIZE_MAX)); - if (nbytes <= 0) - return -1; - base = (char *) base + nbytes; - size -= nbytes; - } - - return 1; -} - - -const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; diff --git a/gcc/config/pa/x-hpux b/gcc/config/pa/x-hpux deleted file mode 100644 index 2f16d317039..00000000000 --- 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/pa/x-linux deleted file mode 100644 index 8a5bc6fcf36..00000000000 --- a/gcc/config/pa/x-linux +++ /dev/null @@ -1,4 +0,0 @@ -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/x-hpux b/gcc/config/x-hpux new file mode 100644 index 00000000000..fa0c5553c3d --- /dev/null +++ b/gcc/config/x-hpux @@ -0,0 +1,4 @@ +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/host-hpux.c