mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-08 06:36:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

collect2.c (resolve_lib_name): Move '/' check to more rational place.

Browse Source 
* collect2.c (resolve_lib_name): Move '/' check to more rational place.

        * ginclude/stddef.h (NULL): define for non-gnu C++ parsers as 0.

From-SVN: r34687
This commit is contained in:
Jason Merrill 2000-06-24 18:19:46 -04:00
parent 40f1e34222
commit be78ffb226
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2000-06-24 Marc Espie <espie@cvs.openbsd.org>
* collect2.c (resolve_lib_name): Move '/' check to more rational place.
2000-06-24 Dirk Duellmann <Dirk.Duellmann@cern.ch>
* ginclude/stddef.h (NULL): define for non-gnu C++ parsers as 0.
2000-06-24 Jakub Jelinek <jakub@redhat.com>
* stmt.c (expand_decl_cleanup): Emit a dummy insn after

12
gcc/collect2.c
View File

@ -2993,14 +2993,14 @@ resolve_lib_name (name)
struct prefix_list *list = libpaths[i]->plist;
for (; list; list = list->next)
{
/* The following lines are needed because path_prefix list
may contain directories both with trailing '/' and
without it. */
const char *p = "";
if (list->prefix[strlen(list->prefix)-1] != '/')
p = "/";
for (j = 0; libexts[j]; j++)
{
/* The following lines are needed because path_prefix list
may contain directories both with trailing '/' and
without it. */
const char *p = "";
if (list->prefix[strlen(list->prefix)-1] != '/')
p = "/";
sprintf (lib_buf, "%s%slib%s.%s",
list->prefix, p, name, libexts[j]);
if (debug) fprintf (stderr, "searching for: %s\n", lib_buf);

6
gcc/ginclude/stddef.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1989, 1997, 1998, 1999 Free Software Foundation, Inc.
/* Copyright (C) 1989, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of GNU CC.
@ -356,7 +356,11 @@ typedef __WINT_TYPE__ wint_t;
#ifdef __GNUG__
#define NULL __null
#else /* G++ */
#ifndef __cplusplus
#define NULL ((void *)0)
#else /* C++ */
#define NULL 0
#endif /* C++ */
#endif /* G++ */
#endif /* NULL not defined and <stddef.h> or need NULL. */
#undef __need_NULL