Cody Schafer avatar Cody Schafer committed 2534a82

apply proper patch

Comments (0)

Files changed (3)

 	download "gccdist.zip" \
 		"ftp://ftp.ni.com/pub/devzone/tut/updated_vxworks63gccdist.zip"
 	extract gccdist.zip
-	patch -d "$SRC/gccdist" -p1 <  wrs_headers-vxtypes.patch || exit
+	patch -d "$SRC/gccdist" -p1 < wrs_headers-regsPpc.patch || exit
 	patch -d "$SRC/gccdist" -p1 < wrs_headers-unistd.patch || exit
 	patch -d "$SRC/gccdist" -p1 < wrs_headers-ioLib.patch  || exit
 	patch -d "$SRC/gccdist" -p1 < wrs_headers-ioLib-protos.patch  || exit
 
 prep_gcc ()
 {
-	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < "gcc.patch" || exit 1
-	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < "gcc-4.6.2-vxworks-libstdcxx.patch" || exit 1
+	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc.patch || exit 1
+	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc-4.6.2-vxworks-libstdcxx.patch || exit 1
 	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc-vxworks-libstdcxx-nominmax.patch || exit 1
 	patch -d "$SRC/gcc-$GCC_VERSION" -p1 < gcc-4.6.3-libstdcxx-stdint.patch || exit 1
 	#( cd "$SRC/gcc-$GCC_VERSION" && ./contrib/download_prerequisites ) || exit

wrs_headers-stdint.patch

 +typedef int64_t intmax_t;
 +typedef uint32_t uintmax_t;
 +
++typedef int8_t int_least8_t;
++typedef int16_t int_least16_t;
++typedef int32_t int_least32_t;
++typedef int64_t int_least64_t;
++typedef uint8_t uint_least8_t;
++typedef uint16_t uint_least16_t;
++typedef uint32_t uint_least32_t;
++typedef uint64_t uint_least64_t;
++
++typedef int8_t int_fast8_t;
++typedef int16_t int_fast16_t;
++typedef int32_t int_fast32_t;
++typedef int64_t int_fast64_t;
++typedef uint8_t uint_fast8_t;
++typedef uint16_t uint_fast16_t;
++typedef uint32_t uint_fast32_t;
++typedef uint64_t uint_fast64_t;
++

wrs_headers-vxtypes.patch

-diff -durp gccdist.orig/WindRiver/vxworks-6.3/target/h/types/vxTypes.h gccdist/WindRiver/vxworks-6.3/target/h/types/vxTypes.h
---- gccdist.orig/WindRiver/vxworks-6.3/target/h/types/vxTypes.h	2012-03-13 11:10:12.311262015 -0400
-+++ gccdist/WindRiver/vxworks-6.3/target/h/types/vxTypes.h	2012-03-13 11:08:10.471258259 -0400
-@@ -234,6 +234,26 @@ _TYPE_quad_t;
- #undef _TYPE_quad_t
- #endif
- 
-+/* int_leastN_t and int_fastN_t */
-+
-+typedef int8_t int_least8_t;
-+typedef int16_t int_least16_t;
-+typedef int32_t int_least32_t;
-+typedef int64_t int_least64_t;
-+typedef uint8_t uint_least8_t;
-+typedef uint16_t uint_least16_t;
-+typedef uint32_t uint_least32_t;
-+typedef uint64_t uint_least64_t;
-+
-+typedef int8_t int_fast8_t;
-+typedef int16_t int_fast16_t;
-+typedef int32_t int_fast32_t;
-+typedef int64_t int_fast64_t;
-+typedef uint8_t uint_fast8_t;
-+typedef uint16_t uint_fast16_t;
-+typedef uint32_t uint_fast32_t;
-+typedef uint64_t uint_fast64_t;
-+
- 
- /* old Berkeley definitions */
- 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.