diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-20 12:27:31 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-20 12:27:31 +0200 |
| commit | a0ac64bb461533e06f99e865f5b2fc315d033b17 (patch) | |
| tree | 9fa683112d553e0ab76feccac26f11d4be9ec48b /recipes/gcc/gcc-4.3.4/debian/boehm-gc-getnprocs.dpatch | |
| parent | f77a615dee76f1c6d560b69ec8c1a245bd46f39c (diff) | |
| parent | 6d77f938e950a882ab500392d9d7074a3dcd15ba (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/gcc/gcc-4.3.4/debian/boehm-gc-getnprocs.dpatch')
| -rw-r--r-- | recipes/gcc/gcc-4.3.4/debian/boehm-gc-getnprocs.dpatch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/recipes/gcc/gcc-4.3.4/debian/boehm-gc-getnprocs.dpatch b/recipes/gcc/gcc-4.3.4/debian/boehm-gc-getnprocs.dpatch new file mode 100644 index 0000000000..8d85cdcbb0 --- /dev/null +++ b/recipes/gcc/gcc-4.3.4/debian/boehm-gc-getnprocs.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh -e + +# DP: boehm-gc/pthread_support.c (GC_get_nprocs): Use sysconf as fallback. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +Index: boehm-gc/pthread_support.c +=================================================================== +--- boehm-gc/pthread_support.c (revision 127207) ++++ boehm-gc/pthread_support.c (working copy) +@@ -724,7 +724,8 @@ + f = open("/proc/stat", O_RDONLY); + if (f < 0 || (len = STAT_READ(f, stat_buf, STAT_BUF_SIZE)) < 100) { + WARN("Couldn't read /proc/stat\n", 0); +- return -1; ++ /* Fallback to sysconf after the warning */ ++ return sysconf(_SC_NPROCESSORS_ONLN); + } + for (i = 0; i < len - 100; ++i) { + if (stat_buf[i] == '\n' && stat_buf[i+1] == 'c' |