aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/gcc-interface/utils2.c
diff options
context:
space:
mode:
authorDoug Rupp <rupp@adacore.com>2008-08-06 07:57:04 +0000
committerArnaud Charlet <charlet@gcc.gnu.org>2008-08-06 09:57:04 +0200
commit31fcb30fe6b1c157846247b2f6b809e8d9e50460 (patch)
tree71efd33f5f59a832e3b2d81100410ebdd6557ba1 /gcc/ada/gcc-interface/utils2.c
parentea08fcdc9403743570d9a278bf91f4a5491373b6 (diff)
downloadgcc-31fcb30fe6b1c157846247b2f6b809e8d9e50460.zip
gcc-31fcb30fe6b1c157846247b2f6b809e8d9e50460.tar.gz
gcc-31fcb30fe6b1c157846247b2f6b809e8d9e50460.tar.bz2
2008-08-06 Doug Rupp <rupp@adacore.com>
* gcc-interface/utils2.c (snames.h) Include (TARGET_ABI_OPEN_VMS): Initialize. (build_call_alloc_dealloc); [TARGET_ABI_OPEN_VMS] Allocate on 32bit heap for Convention C. From-SVN: r138767
Diffstat (limited to 'gcc/ada/gcc-interface/utils2.c')
-rw-r--r--gcc/ada/gcc-interface/utils2.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c
index 89fb5f0..84d5a58 100644
--- a/gcc/ada/gcc-interface/utils2.c
+++ b/gcc/ada/gcc-interface/utils2.c
@@ -45,6 +45,13 @@
#include "einfo.h"
#include "ada-tree.h"
#include "gigi.h"
+#include "snames.h"
+
+/* Let code below know whether we are targetting VMS without need of
+ intrusive preprocessor directives. */
+#ifndef TARGET_ABI_OPEN_VMS
+#define TARGET_ABI_OPEN_VMS 0
+#endif
static tree find_common_type (tree, tree);
static bool contains_save_expr_p (tree);
@@ -1950,7 +1957,9 @@ build_call_alloc_dealloc (tree gnu_obj, tree gnu_size, unsigned align,
/* If the allocator size is 32bits but the pointer size is 64bits then
allocate 32bit memory (sometimes necessary on 64bit VMS). Otherwise
default to standard malloc. */
- if (UI_To_Int (Esize (Etype (gnat_node))) == 32 && POINTER_SIZE == 64)
+ if (TARGET_ABI_OPEN_VMS && POINTER_SIZE == 64
+ && (UI_To_Int (Esize (Etype (gnat_node))) == 32
+ || Convention (Etype (gnat_node)) == Convention_C))
return build_call_1_expr (malloc32_decl, gnu_size);
else
return build_call_1_expr (malloc_decl, gnu_size);