--- gcc/config/pa/pa1-osf.h	2018/04/24 18:23:41	1.1
+++ gcc/config/pa/pa1-osf.h	2018/04/24 18:31:20	1.1.1.2
@@ -16,26 +16,12 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #define TARGET_DEFAULT 0x89	/* TARGET_SNAKE + TARGET_GAS
 				   + TARGET_JUMP_IN_DELAY */
 
-#include "pa/pa.h"
+#include "pa/pa-osf.h"
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dhppa -Dunix -Dhp9000 -Dspectrum -DREVARGV -Dhp700 -DHP700 -Dparisc -D__pa_risc -DPARISC -DBYTE_MSF -DBIT_MSF -Asystem(unix) -Asystem(mach) -Acpu(hppa) -Amachine(hppa)"
-
-/* Don't default to pcc-struct-return, because gcc is the only compiler, and
-   we want to retain compatibility with older gcc versions.  */
-#define DEFAULT_PCC_STRUCT_RETURN 0
-
-/* OSF1 on the PA still uses 16bit wchar_t.  */
-#undef WCHAR_TYPE
-#undef WCHAR_TYPE_SIZE
-
-#define WCHAR_TYPE "short unsigned int"
-#define WCHAR_TYPE_SIZE 16
-
-/* OSF1 wants to be different and use unsigned long as size_t.  */
-#undef SIZE_TYPE
-#define SIZE_TYPE "long unsigned int"