Skip to content

Commit

Permalink
Merge pull request #3 from Gator96100/NewGCC
Browse files Browse the repository at this point in the history
Updated gcc to version 5.3.0
  • Loading branch information
Gator96100 authored Jan 18, 2018
2 parents 7b964b4 + 20b4ab9 commit 9c2ccd0
Show file tree
Hide file tree
Showing 12,154 changed files with 2,399,060 additions and 602,878 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

This cut down development environment has been created specifically for Windows users.
* devkitARM r45
* gcc 4.9.2
* gcc 5.3.0
* Qt 5.6
* perl 5.8.6
* git 2.12.2
* perl 5.24.0
* git 2.15.1.2
## Usage ##

Extract 'ProxSpace' to a location on drive without spaces.
Expand All @@ -33,6 +33,6 @@
Please note that more detail is available on the wiki: https://github.com/Proxmark/proxmark3/wiki

1. Attach the Proxmark III to a USB port on your computer.
3. To flash the BOOTROM run './client/flasher COM1 -b ./bootrom/obj/bootrom.elf'
4. To flash the FULLIMAGE run './client/flasher COM1 ./armsrc/obj/fullimage.elf'
5. Wait for the process to complete.
2. To flash the BOOTROM run './client/flasher COM1 -b ./bootrom/obj/bootrom.elf'
3. To flash the FULLIMAGE run './client/flasher COM1 ./armsrc/obj/fullimage.elf'
4. Wait for the process to complete.
6 changes: 3 additions & 3 deletions msys/etc/fstab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Win32_Path Mount_Point
D:\ProxSpace\devkitARM /devkitARM
D:\ProxSpace\Qt\5.6 /qt
D:\ProxSpace\pm3 /pm3
C:\Users\Julius\Documents\ProxSpace\devkitARM /devkitARM
C:\Users\Julius\Documents\ProxSpace\Qt\5.6 /qt
C:\Users\Julius\Documents\ProxSpace\pm3 /pm3
2 changes: 1 addition & 1 deletion msys/etc/profile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ for i in /etc/profile.d/*.sh ; do
done

export MAKE_MODE=unix
export PS1='\[\033]0;$MSYSTEM:\w\007\033[32m\]pm3 \[\033[33m\w\033[0m\]$ '
export PS1='\[\033]0;$MSYSTEM:\w\007\033[32m\]pm3 \[\033[33m\]\w\[\033[0m\]$ '

alias clear=clsb
alias ls='ls --color=auto'
Expand Down
Binary file added msys/mingw/bin/WhoUses.exe
Binary file not shown.
Binary file added msys/mingw/bin/acountry.exe
Binary file not shown.
Binary file modified msys/mingw/bin/addr2line.exe
Binary file not shown.
Binary file added msys/mingw/bin/adig.exe
Binary file not shown.
Binary file added msys/mingw/bin/ahost.exe
Binary file not shown.
Binary file added msys/mingw/bin/antiword.exe
Binary file not shown.
Binary file modified msys/mingw/bin/ar.exe
Binary file not shown.
Binary file modified msys/mingw/bin/as.exe
Binary file not shown.
Binary file added msys/mingw/bin/blocked-file-util.exe
Binary file not shown.
Binary file added msys/mingw/bin/bunzip2.exe
Binary file not shown.
Binary file added msys/mingw/bin/bzcat.exe
Binary file not shown.
76 changes: 76 additions & 0 deletions msys/mingw/bin/bzcmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#!/bin/sh
# sh is buggy on RS/6000 AIX 3.2. Replace above line with #!/bin/ksh

# Bzcmp/diff wrapped for bzip2,
# adapted from zdiff by Philippe Troin <[email protected]> for Debian GNU/Linux.

# Bzcmp and bzdiff are used to invoke the cmp or the diff pro-
# gram on compressed files. All options specified are passed
# directly to cmp or diff. If only 1 file is specified, then
# the files compared are file1 and an uncompressed file1.gz.
# If two files are specified, then they are uncompressed (if
# necessary) and fed to cmp or diff. The exit status from cmp
# or diff is preserved.

PATH="/usr/bin:/bin:$PATH"; export PATH
prog=`echo $0 | sed 's|.*/||'`
case "$prog" in
*cmp) comp=${CMP-cmp} ;;
*) comp=${DIFF-diff} ;;
esac

OPTIONS=
FILES=
for ARG
do
case "$ARG" in
-*) OPTIONS="$OPTIONS $ARG";;
*) if test -f "$ARG"; then
FILES="$FILES $ARG"
else
echo "${prog}: $ARG not found or not a regular file"
exit 1
fi ;;
esac
done
if test -z "$FILES"; then
echo "Usage: $prog [${comp}_options] file [file]"
exit 1
fi
tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
echo 'cannot create a temporary file' >&2
exit 1
}
set $FILES
if test $# -eq 1; then
FILE=`echo "$1" | sed 's/.bz2$//'`
bzip2 -cd "$FILE.bz2" | $comp $OPTIONS - "$FILE"
STAT="$?"

elif test $# -eq 2; then
case "$1" in
*.bz2)
case "$2" in
*.bz2)
F=`echo "$2" | sed 's|.*/||;s|.bz2$||'`
bzip2 -cdfq "$2" > $tmp
bzip2 -cdfq "$1" | $comp $OPTIONS - $tmp
STAT="$?"
/bin/rm -f $tmp;;

*) bzip2 -cdfq "$1" | $comp $OPTIONS - "$2"
STAT="$?";;
esac;;
*) case "$2" in
*.bz2)
bzip2 -cdfq "$2" | $comp $OPTIONS "$1" -
STAT="$?";;
*) $comp $OPTIONS "$1" "$2"
STAT="$?";;
esac;;
esac
exit "$STAT"
else
echo "Usage: $prog [${comp}_options] file [file]"
exit 1
fi
76 changes: 76 additions & 0 deletions msys/mingw/bin/bzdiff
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#!/bin/sh
# sh is buggy on RS/6000 AIX 3.2. Replace above line with #!/bin/ksh

# Bzcmp/diff wrapped for bzip2,
# adapted from zdiff by Philippe Troin <[email protected]> for Debian GNU/Linux.

# Bzcmp and bzdiff are used to invoke the cmp or the diff pro-
# gram on compressed files. All options specified are passed
# directly to cmp or diff. If only 1 file is specified, then
# the files compared are file1 and an uncompressed file1.gz.
# If two files are specified, then they are uncompressed (if
# necessary) and fed to cmp or diff. The exit status from cmp
# or diff is preserved.

PATH="/usr/bin:/bin:$PATH"; export PATH
prog=`echo $0 | sed 's|.*/||'`
case "$prog" in
*cmp) comp=${CMP-cmp} ;;
*) comp=${DIFF-diff} ;;
esac

OPTIONS=
FILES=
for ARG
do
case "$ARG" in
-*) OPTIONS="$OPTIONS $ARG";;
*) if test -f "$ARG"; then
FILES="$FILES $ARG"
else
echo "${prog}: $ARG not found or not a regular file"
exit 1
fi ;;
esac
done
if test -z "$FILES"; then
echo "Usage: $prog [${comp}_options] file [file]"
exit 1
fi
tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
echo 'cannot create a temporary file' >&2
exit 1
}
set $FILES
if test $# -eq 1; then
FILE=`echo "$1" | sed 's/.bz2$//'`
bzip2 -cd "$FILE.bz2" | $comp $OPTIONS - "$FILE"
STAT="$?"

elif test $# -eq 2; then
case "$1" in
*.bz2)
case "$2" in
*.bz2)
F=`echo "$2" | sed 's|.*/||;s|.bz2$||'`
bzip2 -cdfq "$2" > $tmp
bzip2 -cdfq "$1" | $comp $OPTIONS - $tmp
STAT="$?"
/bin/rm -f $tmp;;

*) bzip2 -cdfq "$1" | $comp $OPTIONS - "$2"
STAT="$?";;
esac;;
*) case "$2" in
*.bz2)
bzip2 -cdfq "$2" | $comp $OPTIONS "$1" -
STAT="$?";;
*) $comp $OPTIONS "$1" "$2"
STAT="$?";;
esac;;
esac
exit "$STAT"
else
echo "Usage: $prog [${comp}_options] file [file]"
exit 1
fi
132 changes: 132 additions & 0 deletions msys/mingw/bin/bzegrep
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
#!/bin/sh

# bzgrep -- a wrapper around a grep program that decompresses files as needed
# Adapted from zgrep of the Debian gzip package by Anibal Monsalve Salazar.
# Adapted from a version sent by Charles Levert <[email protected]>

# Copyright (C) 1998, 2001, 2002 Free Software Foundation
# Copyright (C) 1993 Jean-loup Gailly

# 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, 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.

PATH="/usr/bin:$PATH"; export PATH

prog=`echo "$0" | sed 's|.*/||'`
case "$prog" in
*egrep) grep=${EGREP-egrep} ;;
*fgrep) grep=${FGREP-fgrep} ;;
*) grep=${GREP-grep} ;;
esac

pat=""
after_dash_dash=""
files_with_matches=0
files_without_matches=0
no_filename=0
with_filename=0

while test $# -ne 0; do
case "$after_dash_dash$1" in
--d* | --rec*) echo >&2 "$0: $1: option not supported"; exit 2;;
--files-with-*) files_with_matches=1;;
--files-witho*) files_without_matches=1;;
--no-f*) no_filename=1;;
--wi*) with_filename=1;;
--*) ;;
-*)
case "$1" in
-*[dr]*) echo >&2 "$0: $1: option not supported"; exit 2;;
esac
case "$1" in
-*H*) with_filename=1;;
esac
case "$1" in
-*h*) no_filename=1;;
esac
case "$1" in
-*L*) files_without_matches=1;;
esac
case "$1" in
-*l*) files_with_matches=1;;
esac;;
esac
case "$after_dash_dash$1" in
-[ef]) opt="$opt $1"; shift; pat="$1"
if test "$grep" = grep; then # grep is buggy with -e on SVR4
grep=egrep
fi;;
-[ABCdm])opt="$opt $1 $2"; shift;;
--) opt="$opt $1"; after_dash_dash=1;;
-*) opt="$opt $1";;
*) if test -z "$pat"; then
pat="$1"
else
break;
fi;;
esac
shift
done

if test -z "$pat"; then
echo "grep through bzip2 files"
echo "usage: $prog [grep_options] pattern [files]"
exit 2
fi

if test $# -eq 0; then
bzip2 -cdfq | $grep $opt "$pat"
exit $?
fi

res=0
for i do
bzip2 -cdfq -- "$i" |
if test $files_with_matches -eq 1; then
$grep $opt "$pat" > /dev/null && printf "%s\n" "$i"
elif test $files_without_matches -eq 1; then
$grep $opt "$pat" > /dev/null || printf "%s\n" "$i"
elif test $with_filename -eq 0 && { test $# -eq 1 || test $no_filename -eq 1; }; then
$grep $opt "$pat"
else
i=$(echo "$i" | sed -e 's/[\\|&]/\\&/g')
if test $with_filename -eq 1; then
sed_script="s|^[^:]*:|${i}:|"
else
sed_script="s|^|${i}:|"
fi
# Hack adapted from GPLed code at
# http://home.comcast.net/~j.p.h/cus-faq-2
# Has the same effect as the following two lines of bash:
#
# $grep $opt "$pat" | sed "$sed_script"
# exit ${PIPESTATUS[0]}
#
# Inside the `...`, fd4 goes to the pipe whose other end is read
# and passed to eval; fd1 is the normal standard output
# preserved the line before with exec 3>&1
exec 3>&1
eval `
exec 4>&1 >&3 3>&-
{
$grep $opt "$pat" 4>&-; echo "r=$?;" >&4
} | sed "$sed_script"
`
exit $r
fi
r=$?
test $res -lt $r && res=$r
done
exit $res
Loading

0 comments on commit 9c2ccd0

Please sign in to comment.