aboutsummaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2007-05-17 10:39:32 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2007-05-17 10:39:32 +0200
commit2d24f24b97c347da705188b5f96dfcacd76b2d4c (patch)
tree19fb736fd9a917500a93c71edfce4561975e9cb9 /libgfortran
parentb02b9b53ec39cfd36e27424c4c07be5880ec393a (diff)
downloadgcc-2d24f24b97c347da705188b5f96dfcacd76b2d4c.zip
gcc-2d24f24b97c347da705188b5f96dfcacd76b2d4c.tar.gz
gcc-2d24f24b97c347da705188b5f96dfcacd76b2d4c.tar.bz2
re PR fortran/31917 ([4.1 only] GFORTRAN_CONVERT_UNIT is ignored)
2007-05-14 Tobias Burnus <burnus@net-b.de> PR fortran/31917 * runtime/environ.c (mark_range): Fix setting default convert unit. From-SVN: r124787
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/runtime/environ.c16
2 files changed, 19 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 531787f..6d3e78e 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-17 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/31917
+ * runtime/environ.c (mark_range): Fix setting default convert unit.
+
2007-05-15 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/31922
diff --git a/libgfortran/runtime/environ.c b/libgfortran/runtime/environ.c
index c9c1e27..388383c 100644
--- a/libgfortran/runtime/environ.c
+++ b/libgfortran/runtime/environ.c
@@ -868,14 +868,13 @@ mark_range (int unit1, int unit2)
static int
do_parse (void)
{
- int tok, def;
+ int tok;
int unit1;
int continue_ulist;
char *start;
unit_count = 0;
- def = 0;
start = p;
/* Parse the string. First, let's look for a default. */
@@ -930,6 +929,7 @@ do_parse (void)
break;
case END:
+ def = endian;
goto end;
break;
@@ -946,6 +946,18 @@ do_parse (void)
tok = next_token ();
switch (tok)
{
+ case NATIVE:
+ if (next_token () != ':')
+ goto error;
+ endian = CONVERT_NATIVE;
+ break;
+
+ case SWAP:
+ if (next_token () != ':')
+ goto error;
+ endian = CONVERT_SWAP;
+ break;
+
case LITTLE:
if (next_token () != ':')
goto error;