ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix msvcc.sh botch

Browse Source
This commit is contained in:
Anthony Green
2011-02-08 13:50:43 -05:00
parent dc411e8f99
commit b8099539f0
9 changed files with 88 additions and 1819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.pc/fix-grammar/ChangeLog
View File

@@ -1,7 +1,3 @@
2011-02-08 Ed <ed@kdtc.net>
* src/powerpc/asm.h: Fix grammar nit in comment.
2011-02-08 Uli Link <ul.mcamafia@linkitup.de> 2011-02-08 Uli Link <ul.mcamafia@linkitup.de>
* include/ffi.h.in (FFI_64_BIT_MAX): Define and use. * include/ffi.h.in (FFI_64_BIT_MAX): Define and use.

22
.pc/ml64-safeseh/msvcc.sh
View File

@@ -65,13 +65,25 @@ do
ml="ml64" # "$MSVC/x86_amd64/ml64" ml="ml64" # "$MSVC/x86_amd64/ml64"
shift 1 shift 1
;; ;;
-O0)
args="$args -Od"
shift 1
;;
-O*) -O*)
args="$args $1" # If we're optimizing, make sure we explicitly turn on some optimizations
# that are implicitly disabled by debug symbols (-Zi).
args="$args $1 -OPT:REF -OPT:ICF -INCREMENTAL:NO"
shift 1 shift 1
;; ;;
-g) -g)
# Can't specify -RTC1 or -Zi in opt. -Gy is ok. Use -OPT:REF? # Enable debug symbol generation.
args="$args -D_DEBUG -RTC1 -Zi" args="$args -Zi -DEBUG"
shift 1
;;
-DFFI_DEBUG)
# Link against debug CRT and enable runtime error checks.
args="$args -RTC1"
defines="$defines $1"
md=-MDd md=-MDd
shift 1 shift 1
;; ;;
@@ -108,8 +120,8 @@ do
shift 1 shift 1
;; ;;
-Wall) -Wall)
# -Wall on MSVC is overzealous. Use -W3 instead. # -Wall on MSVC is overzealous, and we already build with -W3. Nothing
args="$args -W3" # to do here.
shift 1 shift 1
;; ;;
-Werror) -Werror)

1803
.pc/win64-underscore/Makefile.in
View File

File diff suppressed because it is too large Load Diff

0
compile Executable file → Normal file
View File

0
mdate-sh Normal file → Executable file
View File

22
msvcc.sh
View File

@@ -67,13 +67,25 @@ do
safeseh= safeseh=
shift 1 shift 1
;; ;;
-O0)
args="$args -Od"
shift 1
;;
-O*) -O*)
args="$args $1" # If we're optimizing, make sure we explicitly turn on some optimizations
# that are implicitly disabled by debug symbols (-Zi).
args="$args $1 -OPT:REF -OPT:ICF -INCREMENTAL:NO"
shift 1 shift 1
;; ;;
-g) -g)
# Can't specify -RTC1 or -Zi in opt. -Gy is ok. Use -OPT:REF? # Enable debug symbol generation.
args="$args -D_DEBUG -RTC1 -Zi" args="$args -Zi -DEBUG"
shift 1
;;
-DFFI_DEBUG)
# Link against debug CRT and enable runtime error checks.
args="$args -RTC1"
defines="$defines $1"
md=-MDd md=-MDd
shift 1 shift 1
;; ;;
@@ -110,8 +122,8 @@ do
shift 1 shift 1
;; ;;
-Wall) -Wall)
# -Wall on MSVC is overzealous. Use -W3 instead. # -Wall on MSVC is overzealous, and we already build with -W3. Nothing
args="$args -W3" # to do here.
shift 1 shift 1
;; ;;
-Werror) -Werror)

12
patches/fix-grammar
View File

@@ -11,3 +11,15 @@ Index: libffi/src/powerpc/asm.h
to locate our caller and so it can restore it; so store one just to locate our caller and so it can restore it; so store one just
for its benefit. */ for its benefit. */
#ifdef PIC #ifdef PIC
Index: libffi/ChangeLog
===================================================================
--- libffi.orig/ChangeLog
+++ libffi/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-08 Ed <ed@kdtc.net>
+
+ * src/powerpc/asm.h: Fix grammar nit in comment.
+
2011-02-08 Uli Link <ul.mcamafia@linkitup.de>
* include/ffi.h.in (FFI_64_BIT_MAX): Define and use.

4
patches/ml64-safeseh
View File

@@ -32,8 +32,8 @@ Index: libffi/msvcc.sh
+ safeseh= + safeseh=
shift 1 shift 1
;; ;;
-O*) -O0)
@@ -164,7 +166,7 @@ if [ -n "$assembly" ]; then @@ -176,7 +178,7 @@ if [ -n "$assembly" ]; then
echo "$cl -nologo -EP $includes $defines $src > $ppsrc" echo "$cl -nologo -EP $includes $defines $src > $ppsrc"
"$cl" -nologo -EP $includes $defines $src > $ppsrc || exit $? "$cl" -nologo -EP $includes $defines $src > $ppsrc || exit $?
output="$(echo $output | sed 's%/F[dpa][^ ]*%%g')" output="$(echo $output | sed 's%/F[dpa][^ ]*%%g')"

40
patches/msvcc-warning
View File

@@ -32,6 +32,46 @@ Index: libffi/msvcc.sh
md=-MD md=-MD
cl="cl" cl="cl"
ml="ml" ml="ml"
@@ -65,13 +65,25 @@ do
ml="ml64" # "$MSVC/x86_amd64/ml64"
shift 1
;;
+ -O0)
+ args="$args -Od"
+ shift 1
+ ;;
-O*)
- args="$args $1"
+ # If we're optimizing, make sure we explicitly turn on some optimizations
+ # that are implicitly disabled by debug symbols (-Zi).
+ args="$args $1 -OPT:REF -OPT:ICF -INCREMENTAL:NO"
shift 1
;;
-g)
- # Can't specify -RTC1 or -Zi in opt. -Gy is ok. Use -OPT:REF?
- args="$args -D_DEBUG -RTC1 -Zi"
+ # Enable debug symbol generation.
+ args="$args -Zi -DEBUG"
+ shift 1
+ ;;
+ -DFFI_DEBUG)
+ # Link against debug CRT and enable runtime error checks.
+ args="$args -RTC1"
+ defines="$defines $1"
md=-MDd
shift 1
;;
@@ -108,8 +120,8 @@ do
shift 1
;;
-Wall)
- # -Wall on MSVC is overzealous. Use -W3 instead.
- args="$args -W3"
+ # -Wall on MSVC is overzealous, and we already build with -W3. Nothing
+ # to do here.
shift 1
;;
-Werror)
Index: libffi/ChangeLog Index: libffi/ChangeLog
=================================================================== ===================================================================
--- libffi.orig/ChangeLog --- libffi.orig/ChangeLog