diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-19 06:14:19 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-19 06:14:19 +0000 |
| commit | 43c61a0d64250b205ca79be3102cf7115ddacd0b (patch) | |
| tree | 535259e91e0fedbc67e86254b4f1684dbabc21f8 /libgfortran | |
| parent | 8747de05baa0f7a4e2f7960f59b96ebe1f67f640 (diff) | |
| download | gcc-43c61a0d64250b205ca79be3102cf7115ddacd0b.tar.gz | |
2007-07-19 Christopher D. Rickett <crickett@lanl.gov>
PR fortran/32600
* trans-expr.c (gfc_conv_function_call): Inline C_LOC.
2007-07-19 Christopher D. Rickett <crickett@lanl.gov>
PR fortran/32600
* libgfortran/intrinsics/iso_c_binding.c: Remove C_LOC.
* libgfortran/intrinsics/iso_c_binding.h: Ditto.
* libgfortran/gfortran.map: Ditto.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126744 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/gfortran.map | 1 | ||||
| -rw-r--r-- | libgfortran/intrinsics/iso_c_binding.c | 17 | ||||
| -rw-r--r-- | libgfortran/intrinsics/iso_c_binding.h | 1 |
4 files changed, 7 insertions, 19 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index a6b20fb7511..560e8bc5d94 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2007-07-19 Christopher D. Rickett <crickett@lanl.gov> + + PR fortran/32600 + * libgfortran/intrinsics/iso_c_binding.c: Remove C_LOC. + * libgfortran/intrinsics/iso_c_binding.h: Ditto. + * libgfortran/gfortran.map: Ditto. + 2007-07-15 Jerry DeLisle <jvdelisle@gcc.gnu.org> Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> diff --git a/libgfortran/gfortran.map b/libgfortran/gfortran.map index 76dba0ce406..f8d184a5079 100644 --- a/libgfortran/gfortran.map +++ b/libgfortran/gfortran.map @@ -1019,7 +1019,6 @@ GFORTRAN_1.0 { __iso_c_binding_c_f_pointer_u0; __iso_c_binding_c_f_procpointer; __iso_c_binding_c_funloc; - __iso_c_binding_c_loc; local: *; }; diff --git a/libgfortran/intrinsics/iso_c_binding.c b/libgfortran/intrinsics/iso_c_binding.c index 33575475aa6..d73a9ce93d7 100644 --- a/libgfortran/intrinsics/iso_c_binding.c +++ b/libgfortran/intrinsics/iso_c_binding.c @@ -213,23 +213,6 @@ ISO_C_BINDING_PREFIX (c_associated_2) (void *c_ptr_in_1, void *c_ptr_in_2) } -/* Return the C address of the given Fortran allocatable object. */ - -void * -ISO_C_BINDING_PREFIX (c_loc) (void *f90_obj) -{ - if (f90_obj == NULL) - { - runtime_error ("C_LOC: Attempt to get C address for Fortran object" - " that has not been allocated or associated"); - abort (); - } - - /* The "C" address should be the address of the object in Fortran. */ - return f90_obj; -} - - /* Return the C address of the given Fortran procedure. This routine is expected to return a derived type of type C_FUNPTR, which represents the C address of the given Fortran object. */ diff --git a/libgfortran/intrinsics/iso_c_binding.h b/libgfortran/intrinsics/iso_c_binding.h index afd85529e9d..1e51ad53d2d 100644 --- a/libgfortran/intrinsics/iso_c_binding.h +++ b/libgfortran/intrinsics/iso_c_binding.h @@ -64,7 +64,6 @@ void ISO_C_BINDING_PREFIX(c_f_pointer_u0) (void *, gfc_array_void *, void ISO_C_BINDING_PREFIX(c_f_pointer_d0) (void *, gfc_array_void *, const array_t *); -void *ISO_C_BINDING_PREFIX(c_loc) (void *); void *ISO_C_BINDING_PREFIX(c_funloc) (void *); #endif |