[llvm-commits] CVS: llvm/tools/llvm-config/Makefile find-cycles.pl llvm-config.in.in
Changes in directory llvm/tools/llvm-config:
Makefile updated: 1.14 - 1.15
find-cycles.pl updated: 1.5 - 1.6
llvm-config.in.in updated: 1.20 - 1.21
---
Log message:
Removed usage of sort, which can lead to undeterministic behavior on mingw
cygwin platforms.
---
Diffs of the changes: (+3 -3)
Makefile |2 +-
find-cycles.pl|2 +-
llvm-config.in.in |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: llvm/tools/llvm-config/Makefile
diff -u llvm/tools/llvm-config/Makefile:1.14
llvm/tools/llvm-config/Makefile:1.15
--- llvm/tools/llvm-config/Makefile:1.14Thu Aug 3 16:46:42 2006
+++ llvm/tools/llvm-config/Makefile Fri Aug 4 16:52:23 2006
@@ -33,7 +33,7 @@
$(LibDeps): $(GenLibDeps) $(LibDir) $(wildcard $(LibDir)/*.a $(LibDir)/*.o)
$(Echo) Regenerating LibDeps.txt
- $(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH) | sort $(LibDeps)
+ $(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH)
# Find all the cyclic dependencies between various LLVM libraries, so we
# don't have to process them at runtime.
Index: llvm/tools/llvm-config/find-cycles.pl
diff -u llvm/tools/llvm-config/find-cycles.pl:1.5
llvm/tools/llvm-config/find-cycles.pl:1.6
--- llvm/tools/llvm-config/find-cycles.pl:1.5 Thu Aug 3 16:46:42 2006
+++ llvm/tools/llvm-config/find-cycles.pl Fri Aug 4 16:52:23 2006
@@ -29,7 +29,7 @@
# Read our dependency information.
while () {
chomp;
-my ($module, $dependency_str) = /^([^:]*): ?(.*)$/;
+my ($module, $dependency_str) = /^\s*([^:]+):\s*(.*)\s*$/;
die Malformed data: $_ unless defined $dependency_str;
my @dependencies = split(/ /, $dependency_str);
$DEPS{$module} = [EMAIL PROTECTED];
Index: llvm/tools/llvm-config/llvm-config.in.in
diff -u llvm/tools/llvm-config/llvm-config.in.in:1.20
llvm/tools/llvm-config/llvm-config.in.in:1.21
--- llvm/tools/llvm-config/llvm-config.in.in:1.20 Thu Aug 3 16:45:35 2006
+++ llvm/tools/llvm-config/llvm-config.in.inFri Aug 4 16:52:23 2006
@@ -275,7 +275,7 @@
$DEPENDENCIES_LOADED = 1;
while (DATA) {
# Parse our line.
-my ($libs, $deps) = /^\s*([^:]+):\s+(.*)\s*$/;
+my ($libs, $deps) = /^\s*([^:]+):\s*(.*)\s*$/;
die Malformed dependency data unless defined $deps;
my @libs = split(' ', $libs);
my @deps = split(' ', $deps);
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] CVS: llvm/tools/llvm-config/Makefile find-cycles.pl llvm-config.in.in
Anton,
Part of this patch is incorrect, please see below ..
On Fri, 2006-08-04 at 16:52 -0500, Anton Korobeynikov wrote:
$(LibDeps): $(GenLibDeps) $(LibDir) $(wildcard $(LibDir)/*.a $(LibDir)/*.o)
$(Echo) Regenerating LibDeps.txt
- $(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH) | sort $(LibDeps)
+ $(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH)
The output still needs to go to $(LibDeps). You've changed it to go to
stdout. Please correct this quickly as it could break the build.
Index: llvm/tools/llvm-config/find-cycles.pl
diff -u llvm/tools/llvm-config/find-cycles.pl:1.5
llvm/tools/llvm-config/find-cycles.pl:1.6
--- llvm/tools/llvm-config/find-cycles.pl:1.5 Thu Aug 3 16:46:42 2006
+++ llvm/tools/llvm-config/find-cycles.pl Fri Aug 4 16:52:23 2006
@@ -29,7 +29,7 @@
# Read our dependency information.
while () {
chomp;
-my ($module, $dependency_str) = /^([^:]*): ?(.*)$/;
+my ($module, $dependency_str) = /^\s*([^:]+):\s*(.*)\s*$/;
Looks good.
die Malformed data: $_ unless defined $dependency_str;
my @dependencies = split(/ /, $dependency_str);
$DEPS{$module} = [EMAIL PROTECTED];
Index: llvm/tools/llvm-config/llvm-config.in.in
diff -u llvm/tools/llvm-config/llvm-config.in.in:1.20
llvm/tools/llvm-config/llvm-config.in.in:1.21
--- llvm/tools/llvm-config/llvm-config.in.in:1.20 Thu Aug 3 16:45:35 2006
+++ llvm/tools/llvm-config/llvm-config.in.in Fri Aug 4 16:52:23 2006
@@ -275,7 +275,7 @@
$DEPENDENCIES_LOADED = 1;
while (DATA) {
# Parse our line.
-my ($libs, $deps) = /^\s*([^:]+):\s+(.*)\s*$/;
+my ($libs, $deps) = /^\s*([^:]+):\s*(.*)\s*$/;
Looks good.
die Malformed dependency data unless defined $deps;
my @libs = split(' ', $libs);
my @deps = split(' ', $deps);
Thanks, Anton.
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/tools/llvm-config/Makefile find-cycles.pl
Changes in directory llvm/tools/llvm-config: Makefile updated: 1.13 - 1.14 find-cycles.pl updated: 1.4 - 1.5 --- Log message: For PR845: http://llvm.org/PR845 : Enable the makefile check on the result of find-cycles.pl. LLVM is now cycle free and we intend to keep it that way. This patch will fail the build if cycles are found. --- Diffs of the changes: (+2 -4) Makefile |2 +- find-cycles.pl |4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) Index: llvm/tools/llvm-config/Makefile diff -u llvm/tools/llvm-config/Makefile:1.13 llvm/tools/llvm-config/Makefile:1.14 --- llvm/tools/llvm-config/Makefile:1.13Thu Jul 27 18:00:30 2006 +++ llvm/tools/llvm-config/Makefile Thu Aug 3 16:46:42 2006 @@ -39,7 +39,7 @@ # don't have to process them at runtime. $(FinalLibDeps): find-cycles.pl $(LibDeps) $(Echo) Finding cyclic dependencies between LLVM libraries. - -$(Verb) $(PERL) $ $(LibDeps) $@ + $(Verb) $(PERL) $ $(LibDeps) $@ # Rerun our configure substitutions as needed. ConfigInIn = $(PROJ_SRC_DIR)/llvm-config.in.in Index: llvm/tools/llvm-config/find-cycles.pl diff -u llvm/tools/llvm-config/find-cycles.pl:1.4 llvm/tools/llvm-config/find-cycles.pl:1.5 --- llvm/tools/llvm-config/find-cycles.pl:1.4 Wed Jul 26 16:14:04 2006 +++ llvm/tools/llvm-config/find-cycles.pl Thu Aug 3 16:46:42 2006 @@ -71,9 +71,7 @@ } print sort @output; -### FIXME: reenable this after 1.8. -#exit $cycles_found; -exit 0; +exit $cycles_found; #== # Depedency Cycle Support ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/tools/llvm-config/Makefile find-cycles.pl
Changes in directory llvm/tools/llvm-config:
Makefile updated: 1.11 - 1.12
find-cycles.pl updated: 1.2 - 1.3
---
Log message:
Make changes necessary for stopping the build if a cyclic library
dependency is found. The find-cycles.pl script now exits with a return code
that equals the number of cycles found. The Makefile was changed to ignore
the status code of find-cycles.pl. This should be removed once the libraries
are free of cyclic dependencies.
---
Diffs of the changes: (+4 -2)
Makefile |2 +-
find-cycles.pl |4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
Index: llvm/tools/llvm-config/Makefile
diff -u llvm/tools/llvm-config/Makefile:1.11
llvm/tools/llvm-config/Makefile:1.12
--- llvm/tools/llvm-config/Makefile:1.11Thu Jul 6 19:46:18 2006
+++ llvm/tools/llvm-config/Makefile Wed Jul 26 12:10:54 2006
@@ -39,7 +39,7 @@
# don't have to process them at runtime.
$(FinalLibDeps): find-cycles.pl $(LibDeps)
$(Echo) Finding cyclic dependencies between LLVM libraries.
- $(Verb) $(PERL) $ $(LibDeps) $@
+ -$(Verb) $(PERL) $ $(LibDeps) $@
# Rerun our configure substitutions as needed.
ConfigInIn = $(PROJ_SRC_DIR)/llvm-config.in.in
Index: llvm/tools/llvm-config/find-cycles.pl
diff -u llvm/tools/llvm-config/find-cycles.pl:1.2
llvm/tools/llvm-config/find-cycles.pl:1.3
--- llvm/tools/llvm-config/find-cycles.pl:1.2 Thu Mar 23 17:21:29 2006
+++ llvm/tools/llvm-config/find-cycles.pl Wed Jul 26 12:10:54 2006
@@ -40,6 +40,7 @@
# Print out the finished cycles, with their dependencies.
my @output;
+my $cycles_found = 0;
foreach my $cycle (@CYCLES) {
my @modules = sort keys %{$cycle};
@@ -57,6 +58,7 @@
# Warn about possible linker problems.
my @archives = grep(/\.a$/, @modules);
if (@archives 1) {
+$cycles_found = $cycles_found + 1;
print STDERR find-cycles.pl: Circular dependency between *.a
files:\n;
print STDERR find-cycles.pl: , join(' ', @archives), \n;
print STDERR find-cycles.pl: Some linkers may have problems.\n;
@@ -68,7 +70,7 @@
join(' ', sort keys %dependencies) . \n);
}
print sort @output;
-
+exit $cycles_found;
#==
# Depedency Cycle Support
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
