aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-05-02 15:49:50 +0200
committerPatrik Nyblom <[email protected]>2011-12-02 15:21:10 +0100
commit7f9e276476c4939cf3c79f6786abf0b714cee333 (patch)
tree2843b4f7d73a08f25afaed6dbb3f2334a5dd61fa /erts
parent7b3596ba1521f201c9416fc7a0385cb7e6c6f495 (diff)
downloadotp-7f9e276476c4939cf3c79f6786abf0b714cee333.tar.gz
otp-7f9e276476c4939cf3c79f6786abf0b714cee333.tar.bz2
otp-7f9e276476c4939cf3c79f6786abf0b714cee333.zip
Get working prompt in Win64 using bootstrap code
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/global.h3
-rw-r--r--erts/etc/win32/msys_tools/vc/cc.sh3
2 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index d5b74efd98..e9b5e7e0e5 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -399,6 +399,9 @@ extern Eterm erts_ddll_monitor_driver(Process *p,
typedef struct binary {
ERTS_INTERNAL_BINARY_FIELDS
long orig_size;
+#if SIZEOF_LONG < SIZEOF_VOID_P
+ long _pad;
+#endif
char orig_bytes[1]; /* to be continued */
} Binary;
diff --git a/erts/etc/win32/msys_tools/vc/cc.sh b/erts/etc/win32/msys_tools/vc/cc.sh
index d67c746eb8..6c1b20a003 100644
--- a/erts/etc/win32/msys_tools/vc/cc.sh
+++ b/erts/etc/win32/msys_tools/vc/cc.sh
@@ -257,7 +257,8 @@ for x in $SOURCES; do
if test `grep -v $x $MSG_FILE | grep -c '#line'` != "0"; then
o=`echo $x | sed 's,.*/,,' | sed 's,\.cp*$,.o,'`
echo -n $o':'
- cat $MSG_FILE | grep '#line' | grep -v $x | awk -F\" '{printf("%s\n",$2)}' | sort -u | grep -v " " | xargs -n 1 win2msys_path.sh | awk '{printf("\\\n %s ",$0)}'
+# cat $MSG_FILE | grep '#line' | grep -v $x | awk -F\" '{printf("%s\n",$2)}' | sort -u | grep -v " " | xargs -n 1 win2msys_path.sh | awk '{printf("\\\n %s ",$0)}'
+ cat $MSG_FILE | grep '#line' | grep -v $x | awk -F\" '{printf("%s\n",$2)}' | sort -u | grep -v " " | sed 's,^\([A-Za-z]\):[\\/]*,/\1/,;s,\\\\*,/,g'| awk '{printf("\\\n %s ",$0)}'
echo
echo
after_sed=`date '+%s'`