From: "Mark E." <snowball3 AT bigfoot DOT com>
To: djgpp-workers AT delorie DOT com
Date: Mon, 15 May 2000 19:05:20 -0400
MIME-Version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Subject: Fw: DJGPP config changes part 1 of 2
Message-ID: <39204A70.24233.84C5EA@localhost>
X-mailer: Pegasus Mail for Win32 (v3.12c)
Reply-To: djgpp-workers AT delorie DOT com

I'm planning on sending these changes to the gcc maintainers. Those who test 
gcc snapshots take a look and check if anything is wrong. I built and tested 
only with the C compiler since the C++ one is a memory hog when using gc-
page.

--------------------------------------------------------------

For a while now I've been working on gcc 2.96 to configure and build without 
having to always maintain a set of patches. This message contains part 1 
changes that should be straightforward. I posted the float_format change 
separately since I thought it might not be accepted (which it wasn't). 
Another message will have part 2 which contains changes that are more 
ambitous.

Both sets of changes were tested together and successfully bootstrapped with 
LANGUAGES="c" and with the fixproto change to handle drive letters.

gcc/Changelog:

	* x-djgpp: Delete code that conditionally modifies target_alias.
	  Delete code that conditionally modifies 'version'.
	  Delete X_CPPFLAGS.

config/Changelog:

2000-05-15 Mark Elbrecht <snowball3 AT bigfoot DOT com>

	* mh-djgpp: Conditionally set 'target_alias' to djgpp. Conditionally
	  modify 'gcc_version'.

Index: egcs/config/mh-djgpp
===================================================================
RCS file: /cvs/gcc/egcs/config/mh-djgpp,v
retrieving revision 1.2
diff -c -p -r1.2 mh-djgpp
*** mh-djgpp	1999/09/04 15:08:48	1.2
--- mh-djgpp	2000/05/15 21:57:49
***************
*** 2,4 ****
--- 2,19 ----
  # this requires that we set CFLAGS.
  # This used to set -fno-omit-frame-pointer.
  CFLAGS=-O2
+ 
+ # Shorten the target alias so when it is used to set 'libsubdir'
+ # the name will work in both short and long filename environments.
+ ifeq ($(findstring -pc-msdosdjgpp,$(target_alias)),-pc-msdosdjgpp)
+ target_alias=djgpp
+ endif
+ 
+ # The version string must be modified to contain just one dot
+ # because DOS filenames can only have one dot when long filenames
+ # are not available.
+ __version:=$(gcc_version)
+ __version:=$(subst ., ,$(__version))
+ ifeq ($(words $(__version)),3)
+ gcc_version=$(word 1,$(__version)).$(word 2,$(__version))$(word 3,$(__version))
+ endif
Index: egcs/gcc/config/i386/x-djgpp
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/i386/x-djgpp,v
retrieving revision 1.2
diff -c -p -r1.2 x-djgpp
*** x-djgpp	1999/09/04 15:08:57	1.2
--- x-djgpp	2000/05/15 21:58:29
***************
*** 1,22 ****
! # translate the version string, so it can be used on DJGPP, where only
! # one dot in filename is allowed
! 
! # to avoid recursion when redefining $(version)
! _version:=$(version)
! __version=$(subst ., ,$(_version))
! version=$(word 1,$(__version))$(word 2,$(__version)).$(word 3,$(__version))
! 
  SYSTEM_HEADER_DIR=$(DJDIR)/include
- X_CPPFLAGS=-DSTANDARD_INCLUDE_DIR=\"\$$DJDIR/include\" \
- 	   -DSTANDARD_INCLUDE_COMPONENT=\"\"
- 
- # when building a native compiler for DJGPP, make the target_alias
- # a shorter name, since otherwise it will produce some problems, when
- # using the same gcc once with long filenames and once with short (8+3)
- # filenames
- ifeq ($(findstring -pc-msdosdjgpp,$(target_alias)),-pc-msdosdjgpp)
- target_alias=djgpp
- endif
  
  # on DJGPP the 'ln -s' does not work correctly
  LN = cp -p
--- 1,5 ----
! # Location of DJGPP's header directory.
  SYSTEM_HEADER_DIR=$(DJDIR)/include
  
  # on DJGPP the 'ln -s' does not work correctly
  LN = cp -p