From ddf2e1095337e78d686460b25239a02ac7ae13f7 Mon Sep 17 00:00:00 2001 From: Cesar Strauss Date: Tue, 13 Dec 2011 11:21:28 +0000 Subject: [PATCH] re PR ada/49084 (bootstrap failure with Ada enabled) PR ada/49084 * types.h (Byte): Change typedef to 'unsigned char'. * atree.h (struct Flag_Word): Use Byte for 'convention' field. From-SVN: r182275 --- gcc/ada/ChangeLog | 14 ++++++++++---- gcc/ada/atree.h | 2 +- gcc/ada/types.h | 16 ++++++++-------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2a9e3f45be45..c55aad8b4282 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2011-12-13 Cesar Strauss + Eric Botcazou + + PR ada/49084 + * types.h (Byte): Change typedef to 'unsigned char'. + * atree.h (struct Flag_Word): Use Byte for 'convention' field. + 2011-12-12 Robert Dewar * s-taprop-mingw.adb: Minor reformatting. @@ -9,8 +16,7 @@ 2011-12-12 Javier Miranda - * exp_disp.adb (Make_VM_TSD): Complete previous - patch. + * exp_disp.adb (Make_VM_TSD): Complete previous patch. 2011-12-12 Bob Duff @@ -40,8 +46,8 @@ 2011-12-12 Javier Miranda - * exp_disp.adb (Make_VM_TSD): Generate code - to store the value 'alignment in the TSD. + * exp_disp.adb (Make_VM_TSD): Generate code to store the value of + 'alignment in the TSD. 2011-12-12 Bob Duff diff --git a/gcc/ada/atree.h b/gcc/ada/atree.h index 31df7e9c54ff..822b30d34baa 100644 --- a/gcc/ada/atree.h +++ b/gcc/ada/atree.h @@ -139,7 +139,7 @@ struct Flag_Word Boolean flag94 : 1; Boolean flag95 : 1; Boolean flag96 : 1; - Short convention : 8; + Byte convention : 8; }; /* Structure used for extra flags in fourth component overlaying Field12 */ diff --git a/gcc/ada/types.h b/gcc/ada/types.h index 5877f32d3f07..4e29447f826a 100644 --- a/gcc/ada/types.h +++ b/gcc/ada/types.h @@ -6,7 +6,7 @@ * * * C Header File * * * - * Copyright (C) 1992-2010, Free Software Foundation, Inc. * + * Copyright (C) 1992-2011, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -41,24 +41,24 @@ typedef unsigned char Boolean; /* General Use Integer Types */ -/* Signed 32/bit integer */ +/* Signed 32-bit integer */ typedef int Int; -/* Signed 16 bit integer */ +/* Signed 16-bit integer */ typedef short Short; -/* Non/negative Int values */ +/* Non-negative Int values */ typedef Int Nat; /* Positive Int values */ typedef Int Pos; -/* 8/bit unsigned integer */ -typedef char Byte; +/* 8-bit unsigned integer */ +typedef unsigned char Byte; -/* 8/Bit Character and String Types: */ +/* 8-Bit Character and String Types: */ -/* 8/bit character type */ +/* 8-bit character type */ typedef char Char; /* Graphic characters, as defined in ARM */