[llvm-commits] [llvm-gcc-4.2] r84588 - in /llvm-gcc-4.2/trunk: include/libiberty.h libiberty/make-relative-prefix.c

[Bill Wendling]

Author: void
Date: Mon Oct 19 20:40:14 2009
New Revision: 84588

URL: http://llvm.org/viewvc/llvm-project?rev=84588&view=rev
Log:
Add missing LLVM markers.

Modified:
    llvm-gcc-4.2/trunk/include/libiberty.h
    llvm-gcc-4.2/trunk/libiberty/make-relative-prefix.c

Modified: llvm-gcc-4.2/trunk/include/libiberty.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/include/libiberty.h?rev=84588&r1=84587&r2=84588&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/include/libiberty.h (original)
+++ llvm-gcc-4.2/trunk/include/libiberty.h Mon Oct 19 20:40:14 2009
@@ -197,12 +197,14 @@
 extern char *make_relative_prefix (const char *, const char *,
                                    const char *) ATTRIBUTE_MALLOC;
 
+/* LLVM LOCAL begin */
 /* Generate a relocated path to some installation directory without
    attempting to follow any soft links.  Allocates
    return value using malloc.  */
 
 extern char *make_relative_prefix_ignore_links (const char *, const char *,
 						const char *) ATTRIBUTE_MALLOC;
+/* LLVM LOCAL end */
 
 /* Choose a temporary directory to use for scratch files.  */
 

Modified: llvm-gcc-4.2/trunk/libiberty/make-relative-prefix.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libiberty/make-relative-prefix.c?rev=84588&r1=84587&r2=84588&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libiberty/make-relative-prefix.c (original)
+++ llvm-gcc-4.2/trunk/libiberty/make-relative-prefix.c Mon Oct 19 20:40:14 2009
@@ -216,10 +216,11 @@
    function will return /red/green/blue/../../omega/.
 
    If no relative prefix can be found, return NULL.  */
-
+/* LLVM LOCAL begin */
 static char *
 make_relative_prefix_1 (const char *progname, const char *bin_prefix,
 			const char *prefix, const int resolve_links)
+/* LLVM LOCAL end */
 {
   char **prog_dirs, **bin_dirs, **prefix_dirs;
   int prog_num, bin_num, prefix_num;
@@ -289,6 +290,7 @@
 	}
     }
 
+  /* LLVM LOCAL begin */
   if ( resolve_links )
     {
       full_progname = lrealpath (progname);
@@ -297,6 +299,7 @@
     }
   else
     full_progname = strdup(progname);
+  /* LLVM LOCAL end */
 
   prog_dirs = split_directories (full_progname, &prog_num);
   bin_dirs = split_directories (bin_prefix, &bin_num);
@@ -393,7 +396,7 @@
   return ret;
 }
 
-
+/* LLVM LOCAL begin */
 /* Do the full job, including symlink resolution.
    This path will find files installed in the same place as the
    program even when a soft link has been made to the program
@@ -421,4 +424,4 @@
 {
   return make_relative_prefix_1 (progname, bin_prefix, prefix, 0);
 }
-
+/* LLVM LOCAL end */