diff options
| -rw-r--r-- | NOTICE | 31 | ||||
| -rw-r--r-- | appl/NOTICE | 26 | ||||
| -rw-r--r-- | appl/lib/NOTICE | 26 | ||||
| -rw-r--r-- | appl/lib/parseman.b | 4 | ||||
| -rw-r--r-- | lib9/setfcr-Linux-spim.S | 27 | ||||
| -rw-r--r-- | libinterp/NOTICE | 17 | ||||
| -rw-r--r-- | libkeyring/NOTICE | 26 | ||||
| -rw-r--r-- | liblogfs/NOTICE | 26 | ||||
| -rw-r--r-- | libnandfs/NOTICE | 26 | ||||
| -rw-r--r-- | libprefab/NOTICE | 25 | ||||
| -rw-r--r-- | libtk/NOTICE | 26 | ||||
| -rw-r--r-- | limbo/NOTICE | 25 | ||||
| -rwxr-xr-x | makemk.sh | 4 | ||||
| -rw-r--r-- | mkfiles/mkfile-Linux-spim | 13 | ||||
| -rw-r--r-- | module/NOTICE | 25 | ||||
| -rw-r--r-- | tools/NOTICE | 26 | ||||
| -rw-r--r-- | utils/libmach/executable.c | 22 |
17 files changed, 170 insertions, 205 deletions
@@ -1,12 +1,12 @@ This Inferno® distribution includes software from various sources and different portions are therefore subject to different licence terms. -The most stringent is the GNU Public License (version 2), which governs the collection. +The bulk of the tree is covered by the permissive MIT licence reproduced below. Individual components might have their own NOTICE and licence files (LICENCE or COPYING) that cover their content. All of them allow modification and redistribution. They are all compatible with the GPLv2. The following copyright notice covers the contents of this -distribution unless otherwise specified by a given file, directory, or +distribution unless otherwise specified by a given file, directory or directory tree: Inferno® Copyright © 1996-1999 Lucent Technologies Inc. All rights reserved. @@ -15,18 +15,21 @@ Inferno revisions Copyright © 2000-2015 Vita Nuova Holdings Limited. All right Inferno new material Copyright © 2000-2015 Vita Nuova Holdings Limited. All rights reserved. Inferno, Styx, Dis and Limbo are registered trademarks of Vita Nuova Holdings Limited in the USA and other countries. -Plan 9 is a registered trademark of Lucent Technologies Inc. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License (`GPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/appl/NOTICE b/appl/NOTICE index 04cbab52..55e1e0b4 100644 --- a/appl/NOTICE +++ b/appl/NOTICE @@ -10,16 +10,20 @@ Copyright © 1995-1999 Lucent Technologies Inc. Portions Copyright © 1997-2000 Vita Nuova Limited Portions Copyright © 2000-2010 Vita Nuova Holdings Limited -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/appl/lib/NOTICE b/appl/lib/NOTICE index 6169ac2f..55e1e0b4 100644 --- a/appl/lib/NOTICE +++ b/appl/lib/NOTICE @@ -10,16 +10,20 @@ Copyright © 1995-1999 Lucent Technologies Inc. Portions Copyright © 1997-2000 Vita Nuova Limited Portions Copyright © 2000-2010 Vita Nuova Holdings Limited -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License (`LGPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/appl/lib/parseman.b b/appl/lib/parseman.b index bf420763..0f4151e9 100644 --- a/appl/lib/parseman.b +++ b/appl/lib/parseman.b @@ -443,11 +443,11 @@ parsetext[T](state: ref ParseState[T], t: string): list of Text case t[i] { '-' or '.' or '\\' => ch = t[i]; - ' ' => + ' ' or '0' => ch = ' '; 'e' => ch = '\\'; - '|' or '&' => + '|' or '&' or '^' => continue; '(' => if (width > 3) diff --git a/lib9/setfcr-Linux-spim.S b/lib9/setfcr-Linux-spim.S new file mode 100644 index 00000000..9031f628 --- /dev/null +++ b/lib9/setfcr-Linux-spim.S @@ -0,0 +1,27 @@ +#include <sys/regdef.h> +#include <sys/asm.h> + +#define FN(x) .type x,%function; .global x; x +#define ENT +#define RET jr ra + + .file "setfcr-Linux-spim.S" +FN(setfcr): + ENT + mtc1 a0, $31 + RET + +FN(getfcr): + ENT + mfc1 v0, $31 + RET + +FN(getfsr): + ENT + mfc1 v0, $31 + RET + +FN(setfsr): + ENT + mtc1 a0, $31 + RET diff --git a/libinterp/NOTICE b/libinterp/NOTICE deleted file mode 100644 index 1986db19..00000000 --- a/libinterp/NOTICE +++ /dev/null @@ -1,17 +0,0 @@ -Copyright © 1995-1999 Lucent Technologies Inc. -Portions Copyright © 1997-2000 Vita Nuova Limited -Portions Copyright © 2000-2009 Vita Nuova Holdings Limited - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License (`LGPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/libkeyring/NOTICE b/libkeyring/NOTICE index a9a7616f..72174586 100644 --- a/libkeyring/NOTICE +++ b/libkeyring/NOTICE @@ -10,16 +10,20 @@ Copyright © 1995-1999 Lucent Technologies Inc. Portions Copyright © 1997-2000 Vita Nuova Limited Portions Copyright © 2000-2007 Vita Nuova Holdings Limited -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License (`LGPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/liblogfs/NOTICE b/liblogfs/NOTICE index a9db7f59..8e4560c7 100644 --- a/liblogfs/NOTICE +++ b/liblogfs/NOTICE @@ -8,16 +8,20 @@ file such as NOTICE, LICENCE or COPYING. Copyright © 2002, 2003 Vita Nuova Holdings Limited. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/libnandfs/NOTICE b/libnandfs/NOTICE index a9db7f59..8e4560c7 100644 --- a/libnandfs/NOTICE +++ b/libnandfs/NOTICE @@ -8,16 +8,20 @@ file such as NOTICE, LICENCE or COPYING. Copyright © 2002, 2003 Vita Nuova Holdings Limited. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/libprefab/NOTICE b/libprefab/NOTICE deleted file mode 100644 index a9a7616f..00000000 --- a/libprefab/NOTICE +++ /dev/null @@ -1,25 +0,0 @@ -This copyright NOTICE applies to all files in this directory and -subdirectories, unless another copyright notice appears in a given -file or subdirectory. If you take substantial code from this software to use in -other programs, you must somehow include with it an appropriate -copyright notice that includes the copyright notice and the other -notices below. It is fine (and often tidier) to do that in a separate -file such as NOTICE, LICENCE or COPYING. - -Copyright © 1995-1999 Lucent Technologies Inc. -Portions Copyright © 1997-2000 Vita Nuova Limited -Portions Copyright © 2000-2007 Vita Nuova Holdings Limited - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License (`LGPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/libtk/NOTICE b/libtk/NOTICE index 2b1c542d..69851cb9 100644 --- a/libtk/NOTICE +++ b/libtk/NOTICE @@ -11,16 +11,20 @@ Portions Copyright © 1997-2000 Vita Nuova Limited Portions Copyright © 2000-2008 Vita Nuova Holdings Limited Portions Copyright © 2010 Vita Nuova Holdings Limited -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License (`LGPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/limbo/NOTICE b/limbo/NOTICE deleted file mode 100644 index 4d026aa9..00000000 --- a/limbo/NOTICE +++ /dev/null @@ -1,25 +0,0 @@ -This copyright NOTICE applies to all files in this directory and -subdirectories, unless another copyright notice appears in a given -file or subdirectory. If you take substantial code from this software to use in -other programs, you must somehow include with it an appropriate -copyright notice that includes the copyright notice and the other -notices below. It is fine (and often tidier) to do that in a separate -file such as NOTICE, LICENCE or COPYING. - -Copyright © 1995-1999 Lucent Technologies Inc. -Portions Copyright © 1997-2000 Vita Nuova Limited -Portions Copyright © 2000-2009 Vita Nuova Holdings Limited - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -19,8 +19,8 @@ grep -s 'SYSTARG=Plan9' mkconfig || . ./mkconfig PLAT=$ROOT/$SYSTARG/$OBJTYPE # you might need to adjust the CC, LD, AR, and RANLIB definitions after this point -CC="p gcc -m32 -c -I$PLAT/include -I$ROOT/include -I$ROOT/utils/include" -LD="p gcc -m32" +CC="p gcc -c -I$PLAT/include -I$ROOT/include -I$ROOT/utils/include" +LD="p gcc" AR="p ar crvs" RANLIB=":" # some systems still require `ranlib' diff --git a/mkfiles/mkfile-Linux-spim b/mkfiles/mkfile-Linux-spim index c68c798b..9fa842cd 100644 --- a/mkfiles/mkfile-Linux-spim +++ b/mkfiles/mkfile-Linux-spim @@ -5,23 +5,22 @@ CPUS= spim O= o OS= o -AR= mipsel-linux-uclibc-ar +AR= mipsel-linux-gnu-ar ARFLAGS= crvs -AS= mipsel-linux-uclibc-gcc -c -mips32 +AS= mipsel-linux-gnu-gcc -c -mips32 ASFLAGS= -CC= mipsel-linux-uclibc-gcc -c -mips32 +CC= mipsel-linux-gnu-gcc -c -mips32 CFLAGS= -g\ -Os\ -I$ROOT/Linux/spim/include\ -I$ROOT/include\ - -I/usr/X11R6/include + -I/usr/include/X11 ANSICPP= -LD= mipsel-linux-uclibc-gcc -LDFLAGS= -L/usr/openwin/lib\ - -L/usr/X11R6/lib\ +LD= mipsel-linux-gnu-gcc +LDFLAGS= -L/usr/lib/X11 SYSLIBS= diff --git a/module/NOTICE b/module/NOTICE deleted file mode 100644 index 6169ac2f..00000000 --- a/module/NOTICE +++ /dev/null @@ -1,25 +0,0 @@ -This copyright NOTICE applies to all files in this directory and -subdirectories, unless another copyright notice appears in a given -file or subdirectory. If you take substantial code from this software to use in -other programs, you must somehow include with it an appropriate -copyright notice that includes the copyright notice and the other -notices below. It is fine (and often tidier) to do that in a separate -file such as NOTICE, LICENCE or COPYING. - -Copyright © 1995-1999 Lucent Technologies Inc. -Portions Copyright © 1997-2000 Vita Nuova Limited -Portions Copyright © 2000-2010 Vita Nuova Holdings Limited - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License (`LGPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/tools/NOTICE b/tools/NOTICE index 089b8163..b5c3a295 100644 --- a/tools/NOTICE +++ b/tools/NOTICE @@ -8,16 +8,20 @@ file such as NOTICE, LICENCE or COPYING. Copyright © 2000-2007 Vita Nuova Holdings Limited -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License (`LGPL') as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/utils/libmach/executable.c b/utils/libmach/executable.c index 2734cf44..ce12ca83 100644 --- a/utils/libmach/executable.c +++ b/utils/libmach/executable.c @@ -17,7 +17,7 @@ typedef struct { uvlong hdr[1]; } exechdr64; Ehdr elfhdr32; /* elf.h */ - struct mipsexec mips; /* bootexec.h */ + struct mipsexec mips32; /* bootexec.h */ struct mips4kexec mips4k; /* bootexec.h */ struct sparcexec sparc; /* bootexec.h */ struct nextexec next; /* bootexec.h */ @@ -451,22 +451,22 @@ mipsboot(int fd, Fhdr *fp, ExecHdr *hp) { USED(fd); fp->type = FMIPSB; - switch(hp->e.mips.amagic) { + switch(hp->e.mips32.amagic) { default: case 0407: /* some kind of mips */ - settext(fp, (u32int)hp->e.mips.mentry, (u32int)hp->e.mips.text_start, - hp->e.mips.tsize, sizeof(struct mipsexec)+4); - setdata(fp, (u32int)hp->e.mips.data_start, hp->e.mips.dsize, - fp->txtoff+hp->e.mips.tsize, hp->e.mips.bsize); + settext(fp, (u32int)hp->e.mips32.mentry, (u32int)hp->e.mips32.text_start, + hp->e.mips32.tsize, sizeof(struct mipsexec)+4); + setdata(fp, (u32int)hp->e.mips32.data_start, hp->e.mips32.dsize, + fp->txtoff+hp->e.mips32.tsize, hp->e.mips32.bsize); break; case 0413: /* some kind of mips */ - settext(fp, (u32int)hp->e.mips.mentry, (u32int)hp->e.mips.text_start, - hp->e.mips.tsize, 0); - setdata(fp, (u32int)hp->e.mips.data_start, hp->e.mips.dsize, - hp->e.mips.tsize, hp->e.mips.bsize); + settext(fp, (u32int)hp->e.mips32.mentry, (u32int)hp->e.mips32.text_start, + hp->e.mips32.tsize, 0); + setdata(fp, (u32int)hp->e.mips32.data_start, hp->e.mips32.dsize, + hp->e.mips32.tsize, hp->e.mips32.bsize); break; } - setsym(fp, hp->e.mips.nsyms, 0, hp->e.mips.pcsize, hp->e.mips.symptr); + setsym(fp, hp->e.mips32.nsyms, 0, hp->e.mips32.pcsize, hp->e.mips32.symptr); fp->hdrsz = 0; /* header stripped */ return 1; } |