PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.

PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.

[Aaron W. LaFramboise]

A year ago, I asked that MD_STARTFILE_PREFIX be defined for mingw32 to 
enable GCC to be installed in any directory.  Mingw32 does not have a 
/lib, so the usual GCC searches don't work. 
http://gcc.gnu.org/ml/gcc-patches/2003-05/msg02015.html

In that time, this patch has been a continuing source of bug reports and 
subtle problems.

With the MD_STARTFILE_PREFIX macro defined to /mingw/lib, a search path 
like this results:
$PREFIX/bin/gcc/mingw32/version
$PREFIX/bin/gcc
$PREFIX/lib/gcc/mingw32/version
$PREFIX/mingw32/lib
/mingw/lib
$PREFIX/lib

Since /mingw/lib is searched before $PREFIX/lib, this often causes the 
wrong versions of gcc libraries, such as libstdc++-v3, to be linked 
against.  While this is not the behavior the documentation seemed to 
indicate to me*, it seems to be the intended behavior, according to a 
comment in config/i386/sco5.h**.

* "MD_STARTFILE_PREFIX If defined, this macro supplies an additional 
prefix to try after the standard prefixes. MD_EXEC_PREFIX is not 
searched when the -b option is used, or when the compiler is built as a 
cross compiler."

** ". . . We get /usr/gnu/lib first by virtue of the MD_STARTFILE_PREFIX 
below."

As near as I can tell, the only way to fix this is to remove this macro 
and give up being able to install a mingw GCC to any directory.  This 
means having to install the libc (mingw runtime or otherwise) into any 
directory you'd like to install GCC into before you build GCC.

Aaron W. LaFramboise

2004-06-10  Aaron W. LaFramboise <aaronraolete36@aaronwl.com>

	* config/i386/mingw32.h (MD_STARTFILE_PREFIX): Remove.

Index: gcc/gcc/config/i386/mingw32.h
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/config/i386/mingw32.h,v
retrieving revision 1.35
diff -c -3 -p -r1.35 mingw32.h
*** gcc/gcc/config/i386/mingw32.h	26 Sep 2003 03:46:06 -0000	1.35
--- gcc/gcc/config/i386/mingw32.h	8 Jun 2004 05:59:01 -0000
*************** Boston, MA 02111-1307, USA.  */
*** 69,78 ****
   #define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \
     %{!shared:%{!mdll:crt2%O%s}} %{pg:gcrt2%O%s}"

- /* An additional prefix to try after the standard prefixes.  */
- #undef MD_STARTFILE_PREFIX
- #define MD_STARTFILE_PREFIX "/mingw/lib/"
-
   /* Output STRING, a string representing a filename, to FILE.
      We canonicalize it to be in Unix format (backslashes are replaced
      forward slashes.  */
--- 69,74 ----

Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.

[Daniel Jacobowitz]

On Thu, Jun 10, 2004 at 10:20:10PM -0500, Aaron W. LaFramboise wrote:
> As near as I can tell, the only way to fix this is to remove this macro 
> and give up being able to install a mingw GCC to any directory.  This 
> means having to install the libc (mingw runtime or otherwise) into any 
> directory you'd like to install GCC into before you build GCC.

Can't you do this by overriding STANDARD_STARTFILE_PREFIX or so?

-- 
Daniel Jacobowitz

Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.

[Aaron W. LaFramboise]

Daniel Jacobowitz wrote:
> On Thu, Jun 10, 2004 at 10:20:10PM -0500, Aaron W. LaFramboise wrote:
>>As near as I can tell, the only way to fix this is to remove this macro 
>>and give up being able to install a mingw GCC to any directory.  This 
>>means having to install the libc (mingw runtime or otherwise) into any 
>>directory you'd like to install GCC into before you build GCC.
> Can't you do this by overriding STANDARD_STARTFILE_PREFIX or so?

I *think* changing STANDARD_STARTFILE_PREFIX will mess up GCC's install 
tree relocatability in Windows.  (I don't quite understand the logic in 
gcc.c.)  That is, presently, an entire GCC can be copied to a different 
directory, and everything will still work.  This sort of functionality 
is important on Windows.

What's really needed, in my opinion, are macro equivalents to 
standard_startfile_prefix_1 and standard_startfile_prefix_2, which 
specify "/lib/" and "/usr/lib/" respectively.  In addition to helping 
GCC find MinGW libraries in the right place, these macros would also 
prevent searching /lib, which quite possibly may cause subtle bugs if it 
exists and has something in it.

Unfortunately, even this is not ideal, as hard coding paths in this 
manner is almost certainly always wrong, in general, on Windows.  I 
don't think theres anything one can do about this, though, short of 
using something like the registry key support (which I understand may 
disappear soon).

So, would it be appropriate to add the target macros 
STANDARD_STARTFILE_PREFIX_1 and STANDARD_STARTFILE_PREFIX_2?  They make 
more sense as macros than hooks because standard_startfile_prefix_1 and 
standard_startfile_prefix_2 are const.

Aaron W. LaFramboise

Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.

[Gunther Nikl]

On Fri, Jun 11, 2004 at 04:14:52AM -0500, Aaron W. LaFramboise wrote:
> So, would it be appropriate to add the target macros 
> STANDARD_STARTFILE_PREFIX_1 and STANDARD_STARTFILE_PREFIX_2?  They make 
> more sense as macros than hooks because standard_startfile_prefix_1 and 
> standard_startfile_prefix_2 are const.

  FWIW, thats a modification the AmigaOS port (not in the FSF repository)
  does. It does also invent STANDARD_EXEC_PREFIX_[12].

  Gunther

PATCH mingw32 STANDARD_STARTFILE_PREFIX_[12] (Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.)

[Aaron W. LaFramboise]

This patch allows standard_startfile_prefix_1 and 
standard_startfile_prefix_2 to be overriden with macros from their 
traditional hard-coded defaults in gcc.c.  This is necessary on Windows 
(and probably some other non-Unix platforms) where the system has its 
own conventions as to where system libraries are kept.

It also uses the new macros to fix MinGW's search paths.

With this patch, the search order on a normal MinGW installation is as 
follows, which is what I needed.

PREFIX/lib/gcc/i686-pc-mingw32/3.5.0
PREFIX/lib/gcc
PREFIX/lib/gcc/i686-pc-mingw32/3.5.0
PREFIX/i686-pc-mingw32/lib
PREFIX/lib
/mingw/lib

Bootstrapped on i686-pc-mingw32.


2004-06-17  Aaron W. LaFramboise <aaronraolete36@aaronwl.com>

	* gcc.c (STANDARD_STARTFILE_PREFIX_1): Define.
	(STANDARD_STARTFILE_PREFIX_2): Define.
	(standard_startfile_prefix_1): Initialize to
	STANDARD_STARTFILE_PREFIX_1.
	(standard_startfile_prefix_2): Initialize to
	STANDARD_STARTFILE_PREFIX_2.
	* config/i386/mingw32.h (MD_STARTFILE_PREFIX): Remove.
	(STANDARD_STARTFILE_PREFIX_1): Define.
	(STANDARD_STARTFILE_PREFIX_2): Define.
	* doc/tm.texi (STANDARD_STARTFILE_PREFIX_1): Document.
	(STANDARD_STARTFILE_PREFIX_2): Document.

Index: gcc/gcc/gcc.c
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/gcc.c,v
retrieving revision 1.424
diff -c -3 -p -r1.424 gcc.c
*** gcc/gcc/gcc.c	4 Jun 2004 20:13:14 -0000	1.424
--- gcc/gcc/gcc.c	17 Jun 2004 06:32:45 -0000
*************** static const char *gcc_libexec_prefix;
*** 1428,1433 ****
--- 1428,1440 ----

   /* Default prefixes to attach to command names.  */

+ #ifndef STANDARD_STARTFILE_PREFIX_1
+ #define STANDARD_STARTFILE_PREFIX_1 "/lib/"
+ #endif
+ #ifndef STANDARD_STARTFILE_PREFIX_2
+ #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
+ #endif
+
   #ifdef CROSS_COMPILE  /* Don't use these prefixes for a cross 
compiler.  */
   #undef MD_EXEC_PREFIX
   #undef MD_STARTFILE_PREFIX
*************** static const char *md_exec_prefix = MD_E
*** 1453,1460 ****
   static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
   static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
   static const char *const standard_startfile_prefix = 
STANDARD_STARTFILE_PREFIX;
! static const char *const standard_startfile_prefix_1 = "/lib/";
! static const char *const standard_startfile_prefix_2 = "/usr/lib/";

   static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX;
   static const char *tooldir_prefix;
--- 1460,1469 ----
   static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
   static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
   static const char *const standard_startfile_prefix = 
STANDARD_STARTFILE_PREFIX;
! static const char *const standard_startfile_prefix_1
!   = STANDARD_STARTFILE_PREFIX_1;
! static const char *const standard_startfile_prefix_2
!   = STANDARD_STARTFILE_PREFIX_2;

   static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX;
   static const char *tooldir_prefix;
*************** main (int argc, const char **argv)
*** 6230,6239 ****
   		      NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
   	}

!       add_sysrooted_prefix (&startfile_prefixes, 
standard_startfile_prefix_1,
! 			    "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
!       add_sysrooted_prefix (&startfile_prefixes, 
standard_startfile_prefix_2,
! 			    "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
   #if 0 /* Can cause surprises, and one can use -B./ instead.  */
         add_prefix (&startfile_prefixes, "./", NULL,
   		  PREFIX_PRIORITY_LAST, 1, NULL, 0);
--- 6239,6253 ----
   		      NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
   	}

!       if (*standard_startfile_prefix_1)
! 	add_sysrooted_prefix (&startfile_prefixes,
! 		standard_startfile_prefix_1, "BINUTILS",
! 		PREFIX_PRIORITY_LAST, 0, NULL, 1);
!       if (*standard_startfile_prefix_2)
! 	add_sysrooted_prefix (&startfile_prefixes,
! 		standard_startfile_prefix_2, "BINUTILS",
! 		PREFIX_PRIORITY_LAST, 0, NULL, 1);
!
   #if 0 /* Can cause surprises, and one can use -B./ instead.  */
         add_prefix (&startfile_prefixes, "./", NULL,
   		  PREFIX_PRIORITY_LAST, 1, NULL, 0);
Index: gcc/gcc/config/i386/mingw32.h
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/config/i386/mingw32.h,v
retrieving revision 1.35
diff -c -3 -p -r1.35 mingw32.h
*** gcc/gcc/config/i386/mingw32.h	26 Sep 2003 03:46:06 -0000	1.35
--- gcc/gcc/config/i386/mingw32.h	17 Jun 2004 06:32:46 -0000
*************** Boston, MA 02111-1307, USA.  */
*** 69,77 ****
   #define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \
     %{!shared:%{!mdll:crt2%O%s}} %{pg:gcrt2%O%s}"

! /* An additional prefix to try after the standard prefixes.  */
! #undef MD_STARTFILE_PREFIX
! #define MD_STARTFILE_PREFIX "/mingw/lib/"

   /* Output STRING, a string representing a filename, to FILE.
      We canonicalize it to be in Unix format (backslashes are replaced
--- 69,81 ----
   #define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \
     %{!shared:%{!mdll:crt2%O%s}} %{pg:gcrt2%O%s}"

! /* Override startfile prefix defaults.  */
! #ifndef STANDARD_STARTFILE_PREFIX_1
! #define STANDARD_STARTFILE_PREFIX_1 "/mingw/lib/"
! #endif
! #ifndef STANDARD_STARTFILE_PREFIX_2
! #define STANDARD_STARTFILE_PREFIX_2 ""
! #endif

   /* Output STRING, a string representing a filename, to FILE.
      We canonicalize it to be in Unix format (backslashes are replaced
Index: gcc/gcc/doc/tm.texi
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/doc/tm.texi,v
retrieving revision 1.329
diff -c -3 -p -r1.329 tm.texi
*** gcc/gcc/doc/tm.texi	11 Jun 2004 18:41:47 -0000	1.329
--- gcc/gcc/doc/tm.texi	17 Jun 2004 06:33:21 -0000
*************** try when searching for startup files suc
*** 468,473 ****
--- 468,489 ----
   is built as a cross compiler.
   @end defmac

+ @defmac STANDARD_STARTFILE_PREFIX_1
+ Define this macro as a C string constant if you wish to override the
+ standard choice of @code{/lib} as a prefix to try after the default prefix
+ when searching for startup files such as @file{crt0.o}.
+ @code{STANDARD_STARTFILE_PREFIX_1} is not searched when the compiler
+ is built as a cross compiler.
+ @end defmac
+
+ @defmac STANDARD_STARTFILE_PREFIX_2
+ Define this macro as a C string constant if you wish to override the
+ standard choice of @code{/lib} as yet another prefix to try after the
+ default prefix when searching for startup files such as @file{crt0.o}.
+ @code{STANDARD_STARTFILE_PREFIX_2} is not searched when the compiler
+ is built as a cross compiler.
+ @end defmac
+
   @defmac MD_STARTFILE_PREFIX
   If defined, this macro supplies an additional prefix to try after the
   standard prefixes.  @code{MD_EXEC_PREFIX} is not searched when the

Re: PATCH mingw32 STANDARD_STARTFILE_PREFIX_[12] (Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.)

[Mark Mitchell]

Aaron W. LaFramboise wrote:

> This patch allows standard_startfile_prefix_1 and 
> standard_startfile_prefix_2 to be overriden with macros from their 
> traditional hard-coded defaults in gcc.c.  This is necessary on Windows 
> (and probably some other non-Unix platforms) where the system has its 
> own conventions as to where system libraries are kept.
> 
> It also uses the new macros to fix MinGW's search paths.

This patch is OK.

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Re: PATCH mingw32 STANDARD_STARTFILE_PREFIX_[12] (Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.)

[Gunther Nikl]

On Thu, Jun 17, 2004 at 06:11:18PM -0500, Aaron W. LaFramboise wrote:
> ! /* Override startfile prefix defaults.  */
> ! #ifndef STANDARD_STARTFILE_PREFIX_1
> ! #define STANDARD_STARTFILE_PREFIX_1 "/mingw/lib/"
> ! #endif
> ! #ifndef STANDARD_STARTFILE_PREFIX_2
> ! #define STANDARD_STARTFILE_PREFIX_2 ""
> ! #endif

  Is using #ifndef a good idea? Do you think these defines might already
  be present?

  Gunther

Re: PATCH mingw32 STANDARD_STARTFILE_PREFIX_[12] (Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.)

[Aaron W. LaFramboise]

Gunther Nikl wrote:
> On Thu, Jun 17, 2004 at 06:11:18PM -0500, Aaron W. LaFramboise wrote:
>>! /* Override startfile prefix defaults.  */
>>! #ifndef STANDARD_STARTFILE_PREFIX_1
>>! #define STANDARD_STARTFILE_PREFIX_1 "/mingw/lib/"
>>! #endif
>>! #ifndef STANDARD_STARTFILE_PREFIX_2
>>! #define STANDARD_STARTFILE_PREFIX_2 ""
>>! #endif
>   Is using #ifndef a good idea? Do you think these defines might already
>   be present?

The ifndef is what allows the target config to override these values. 
That seemed like the most reasonable way to accomplish this.

Aaron W. LaFramboise

Re: PATCH mingw32 STANDARD_STARTFILE_PREFIX_[12] (Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.)

[Danny Smith]

----- Original Message -----
From: "Aaron W. LaFramboise"
| 2004-06-17  Aaron W. LaFramboise
<aaronraolete36_ATLAY_aaronwl_OTDAY_com>
|
| * gcc.c (STANDARD_STARTFILE_PREFIX_1): Define.
| (STANDARD_STARTFILE_PREFIX_2): Define.
| (standard_startfile_prefix_1): Initialize to
| STANDARD_STARTFILE_PREFIX_1.
| (standard_startfile_prefix_2): Initialize to
| STANDARD_STARTFILE_PREFIX_2.
| * config/i386/mingw32.h (MD_STARTFILE_PREFIX): Remove.
| (STANDARD_STARTFILE_PREFIX_1): Define.
| (STANDARD_STARTFILE_PREFIX_2): Define.
| * doc/tm.texi (STANDARD_STARTFILE_PREFIX_1): Document.
| (STANDARD_STARTFILE_PREFIX_2): Document.


Hello Aaron,

I like this.  However, AFAICT you don't have CVS write acess yet.  Nor
have I been notified of
copyright assignment paperwork being completed.  When I see this, I will
be happy to apply this
patch which has been OK'd by Mark Mitchell.

 I infer from your other postings that you have other major submissions
for mingw32 in the pipe.  If I can be of any help in you getting
write-after-approval I will be glad to assist. Chris Faylor is  the
formal maintainer for win32 targets so it would be polite and probably
helpful for you to include him in your CC's.

Danny

Re: PATCH mingw32 STANDARD_STARTFILE_PREFIX_[12] (Re: PATCH mingw32 MD_STARTFILE_PREFIX was a bad idea.)

[Danny Smith]

From: "Mark Mitchell"
| Aaron W. LaFramboise wrote:
|
| > This patch allows standard_startfile_prefix_1 and
| > standard_startfile_prefix_2 to be overriden with macros from their
| > traditional hard-coded defaults in gcc.c.  This is necessary on
Windows
| > (and probably some other non-Unix platforms) where the system has
its
| > own conventions as to where system libraries are kept.
| >
| > It also uses the new macros to fix MinGW's search paths.
|
| This patch is OK.
|
| --
| Mark Mitchell

I've committed this patch on Aaron's behalf, now that he has received
copyright assignment notification.

Danny