Recognize arm-*-pe* (psion project).

diff --git a/.Sanitize b/.Sanitize
index 76c574746217255af60790d8f071ca351bf39cda..1112b0b70d383be76ed5aea5410c6494ee7ced3e 100644 (file)
--- a/.Sanitize
+++ b/.Sanitize
@@ -92,6 +92,9 @@ Things-to-lose:
 
 Do-last:
 
+# Don't try to clean directories here, as the 'mv' command will fail.
+# Also, grep fails on NFS mounted directories.
+
 if ( echo $* | egrep verbose > /dev/null ) ; then
        verbose=true
 else
@@ -113,8 +116,6 @@ if [ -n "${verbose}" ] ; then
        echo Thawing away the \"chill\"...
 fi
 
-# Don't try to clean directories here, as the 'mv' command will fail.
-# Also, grep fails on NFS mounted directories.
 if ( echo $* | grep keep\-chill > /dev/null ) ; then
        for i in * ; do
                if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
@@ -146,8 +147,6 @@ if [ -n "${verbose}" ] ; then
        echo Removing traces of \"mpw\"...
 fi
 
-# Don't try to clean directories here, as the 'mv' command will fail.
-# Also, grep fails on NFS mounted directories.
 if ( echo $* | grep keep\-mpw > /dev/null ) ; then
        for i in * ; do
                if test ! -d $i && (grep sanitize-mpw $i > /dev/null) ; then
@@ -179,10 +178,10 @@ if [ -n "${verbose}" ] ; then
        echo Processing \"arc\"...
 fi
 
-# Don't try to clean directories here, as the 'mv' command will fail.
-# Also, grep fails on NFS mounted directories.
+arc_files="config.sub configure.in"
+
 if ( echo $* | grep keep\-arc > /dev/null ) ; then
-       for i in * ; do
+       for i in $arc_files ; do
                if test ! -d $i && (grep sanitize-arc $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
                                echo Keeping arc stuff in $i
@@ -208,6 +207,35 @@ else
        done
 fi
 
+psion_files="config.sub configure.in"
+
+if ( echo $* | grep keep\-psion > /dev/null ) ; then
+       for i in $psion_files; do
+               if test ! -d $i && (grep sanitize-psion $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping psion stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-psion $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"psion\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-psion/,/end-\sanitize\-psion/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+fi
+
 rce_files="config.sub"
 
 if ( echo $* | grep keep\-rce > /dev/null ) ; then

diff --git a/configure.in b/configure.in
index 5730b4029486d2c3e07ee83714f6754e58bf27bf..236436ea52bfc247feb807844b404b5d19ce2307 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -344,9 +344,16 @@ case "${target}" in
     ;;
 # start-sanitize-arc
   arc-*-*)
+    # Leave g++ for later.
     noconfigdirs="$noconfigdirs libg++ libstdc++ libio librx"
     ;;
 # end-sanitize-arc
+# start-sanitize-psion
+  arm-*-pe*)
+    # Leave g++ for later.
+    noconfigdirs="$noconfigdirs libg++ libstdc++ libio librx"
+    ;;
+# end-sanitize-psion
   arm-*-*)
     noconfigdirs="$noconfigdirs ld"
     ;;