Patchwork [1/2] ti-c6accel: fix building for uclibc

login
mail settings
Submitter Henning Heinold
Date March 18, 2011, 10:24 a.m.
Message ID <1300443871-31113-2-git-send-email-heinold@inf.fu-berlin.de>
Download mbox | patch
Permalink /patch/1593/
State New, archived
Headers show

Comments

Henning Heinold - March 18, 2011, 10:24 a.m.
From: Henning Heinold <heinold@inf.fu-berlin.de>


Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
---
 recipes/ti/ti-c6accel.inc                   |    2 +-
 recipes/ti/ti-c6accel/fix_time_symbol.patch |   46 +++++++++++++++++++++++++++
 recipes/ti/ti-c6accel_1.01.00.03.bb         |    2 +
 3 files changed, 49 insertions(+), 1 deletions(-)
 create mode 100644 recipes/ti/ti-c6accel/fix_time_symbol.patch

Patch

diff --git a/recipes/ti/ti-c6accel.inc b/recipes/ti/ti-c6accel.inc
index 7d09783..216f4c2 100644
--- a/recipes/ti/ti-c6accel.inc
+++ b/recipes/ti/ti-c6accel.inc
@@ -18,7 +18,7 @@  PROVIDES += "ti-c6accel-apps"
 
 # This recipe links statically against kernel dependant stuff, use kernel PR as base and append a local version
 PR = "${MACHINE_KERNEL_PR}"
-PR_append = "c"
+PR_append = "d"
 
 S = "${WORKDIR}/c6accel_${PV}"
 
diff --git a/recipes/ti/ti-c6accel/fix_time_symbol.patch b/recipes/ti/ti-c6accel/fix_time_symbol.patch
new file mode 100644
index 0000000..9963669
--- /dev/null
+++ b/recipes/ti/ti-c6accel/fix_time_symbol.patch
@@ -0,0 +1,46 @@ 
+Index: c6accel_1_01_00_03/soc/app/benchmark.h
+===================================================================
+--- c6accel_1_01_00_03.orig/soc/app/benchmark.h	2011-03-12 17:45:49.640633120 +0100
++++ c6accel_1_01_00_03/soc/app/benchmark.h	2011-03-12 17:46:10.360988120 +0100
+@@ -39,7 +39,7 @@
+ 
+ 
+  extern Time_Object sTime;
+- extern UInt32      time;
++ extern UInt32      timestamp;
+ 
+  #define OPEN_LOG_FILE(Name)                                    \
+  if ((benchmarkFd = fopen(Name,"wb")) == NULL) {                \
+@@ -49,7 +49,7 @@
+  #define CLOSE_LOG_FILE() fclose(benchmarkFd);
+ 
+  #define START_BENCHMARK()                                     \
+-           Time_delta(&sTime,&time);
++           Time_delta(&sTime,&timestamp);
+ 
+  #define LOG_STRING(str)                                        \
+        fprintf(benchmarkFd,"%s",str);
+@@ -70,8 +70,8 @@
+ 
+ 
+  #define END_AND_WRITE_BENCHMARK()                             \
+-       Time_delta(&sTime,&time);                                \
+-       fprintf(benchmarkFd,"%d",(unsigned int)time);
++       Time_delta(&sTime,&timestamp);                                \
++       fprintf(benchmarkFd,"%d",(unsigned int)timestamp);
+ 
+ 
+ 
+Index: c6accel_1_01_00_03/soc/app/appMain.c
+===================================================================
+--- c6accel_1_01_00_03.orig/soc/app/appMain.c	2011-03-12 17:46:42.030148120 +0100
++++ c6accel_1_01_00_03/soc/app/appMain.c	2011-03-12 17:48:00.619423120 +0100
+@@ -66,7 +66,7 @@
+ /* This object is used in MACRO in benchmark.h */
+ #include "timeObj.h"
+ Time_Object sTime;
+-UInt32      time;
++UInt32      timestamp;
+ 
+ void Time_reset(Time_Object *sTime)
+ {
diff --git a/recipes/ti/ti-c6accel_1.01.00.03.bb b/recipes/ti/ti-c6accel_1.01.00.03.bb
index bf5f1cf..42b0cc6 100644
--- a/recipes/ti/ti-c6accel_1.01.00.03.bb
+++ b/recipes/ti/ti-c6accel_1.01.00.03.bb
@@ -7,6 +7,8 @@  SRC_URI_append = "file://fix-loadmodule.patch \
                   file://0001-soc-honour-buildsystem-CFLAGS-and-LDFLAGS-when-set.patch \
                  "
 
+SRC_URI_append_libc-uclibc = "file://fix_time_symbol.patch"
+
 PV = "1_01_00_03"