From c76ff410800c0c60ab078ec55cc404817cf6df4c Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 14 Apr 2012 09:05:02 +0000 Subject: [PATCH] tools: sdcc: fix order of linking with libm Fixes a build failure caught by buildbot. SVN-Revision: 31284 --- .../patches/200-fix_order_of_linking.patch | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 tools/sdcc/patches/200-fix_order_of_linking.patch diff --git a/tools/sdcc/patches/200-fix_order_of_linking.patch b/tools/sdcc/patches/200-fix_order_of_linking.patch new file mode 100644 index 0000000000..644349755c --- /dev/null +++ b/tools/sdcc/patches/200-fix_order_of_linking.patch @@ -0,0 +1,92 @@ +diff --git a/sdcc/sdas/as6808/Makefile.in b/sdcc/sdas/as6808/Makefile.in +index 5041265..0b8732e 100644 +--- a/sdas/as6808/Makefile.in ++++ b/sdas/as6808/Makefile.in +@@ -36,7 +36,8 @@ VPATH = @srcdir@ + + CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util + CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS) +-LDFLAGS = @LDFLAGS@ -lm ++LDFLAGS = @LDFLAGS@ ++LIBS = -lm + + OBJDIR = obj + +@@ -65,7 +66,7 @@ transform = @program_transform_name@ + all: checkconf $(ASX) + + $(ASX): $(ASOBJECTS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) $(LIBS) + + # Compiling and installing everything and running test + # ---------------------------------------------------- +diff --git a/sdcc/sdas/as8051/Makefile.in b/sdcc/sdas/as8051/Makefile.in +index 8fa5946..fde3001 100644 +--- a/sdas/as8051/Makefile.in ++++ b/sdas/as8051/Makefile.in +@@ -36,7 +36,8 @@ VPATH = @srcdir@ + + CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util + CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS) +-LDFLAGS = @LDFLAGS@ -lm ++LDFLAGS = @LDFLAGS@ ++LIBS = -lm + + OBJDIR = obj + +@@ -65,7 +66,7 @@ transform = @program_transform_name@ + all: checkconf $(ASX) + + $(ASX): $(ASOBJECTS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) $(LIBS) + + # Compiling and installing everything and running test + # ---------------------------------------------------- +diff --git a/sdcc/sdas/asgb/Makefile.in b/sdcc/sdas/asgb/Makefile.in +index 2763b3f..f9afb23 100644 +--- a/sdas/asgb/Makefile.in ++++ b/sdas/asgb/Makefile.in +@@ -36,7 +36,8 @@ VPATH = @srcdir@ + + CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util + CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS) +-LDFLAGS = @LDFLAGS@ -lm ++LDFLAGS = @LDFLAGS@ ++LIBS = -lm + + OBJDIR = obj + +@@ -65,7 +66,7 @@ transform = @program_transform_name@ + all: checkconf $(ASX) + + $(ASX): $(ASOBJECTS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) $(LIBS) + + # Compiling and installing everything and running test + # ---------------------------------------------------- +diff --git a/sdcc/sdas/asz80/Makefile.in b/sdcc/sdas/asz80/Makefile.in +index d2bf1ac..89bd91c 100644 +--- a/sdas/asz80/Makefile.in ++++ b/sdas/asz80/Makefile.in +@@ -36,7 +36,8 @@ VPATH = @srcdir@ + + CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util + CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS) +-LDFLAGS = @LDFLAGS@ -lm ++LDFLAGS = @LDFLAGS@ ++LIBS = -lm + + OBJDIR = obj + +@@ -65,7 +66,7 @@ transform = @program_transform_name@ + all: checkconf $(ASX) + + $(ASX): $(ASOBJECTS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) $(LIBS) + + # Compiling and installing everything and running test + # ---------------------------------------------------- -- 2.30.2