/fix-7g

https://code.google.com/p/7g-patches/ · #! · 80 lines · 65 code · 15 blank · 0 comment · 0 complexity · 0eec7fc103ffb4f52755453f59be7932 MD5 · raw file 

    

  1. # HG changeset patch
    2. 

  2. # Parent 3d4cff9691248f55cce854e054f799fd0791df55
    3. 

  3. 

  4. diff --git a/src/cmd/7g/Makefile b/src/cmd/7g/Makefile
    5. 

  5. --- a/src/cmd/7g/Makefile
    6. 

  6. +++ b/src/cmd/7g/Makefile
    7. 

  7. @@ -5,16 +5,16 @@
    8. 

  8.  include ../../Make.inc
    9. 

  9.  O:=$(HOST_O)
    10. 

  10.  
    11. 

  11. -TARG=8g
    12. 

  12. +TARG=7g
    13. 

  13.  
    14. 

  14.  HFILES=\
    15. 

  15.  	../gc/go.h\
    16. 

  16. -	../8l/8.out.h\
    17. 

  17. +	../7l/7.out.h\
    18. 

  18.  	gg.h\
    19. 

  19.  	opt.h\
    20. 

  20.  
    21. 

  21.  OFILES=\
    22. 

  22. -	../8l/enam.$O\
    23. 

  23. +	../7l/enam.$O\
    24. 

  24.  	cgen.$O\
    25. 

  25.  	cgen64.$O\
    26. 

  26.  	cplx.$O\
    27. 

  27. diff --git a/src/cmd/7g/doc.go b/src/cmd/7g/doc.go
    28. 

  28. --- a/src/cmd/7g/doc.go
    29. 

  29. +++ b/src/cmd/7g/doc.go
    30. 

  30. @@ -4,10 +4,10 @@
    31. 

  31.  
    32. 

  32.  /*
    33. 

  33.  
    34. 

  34. -8g is the version of the gc compiler for the x86.
    35. 

  35. -The $GOARCH for these tools is 386.
    36. 

  36. +7g is the version of the gc compiler for the JVM.
    37. 

  37. +The $GOARCH for these tools is jvm.
    38. 

  38.  
    39. 

  39. -It reads .go files and outputs .8 files. The flags are documented in ../gc/doc.go.
    40. 

  40. +It reads .go files and outputs .class files. The flags are documented in ../gc/doc.go.
    41. 

  41.  
    42. 

  42.  There is no instruction optimizer, so the -N flag is a no-op.
    43. 

  43.  
    44. 

  44. diff --git a/src/cmd/7g/galign.c b/src/cmd/7g/galign.c
    45. 

  45. --- a/src/cmd/7g/galign.c
    46. 

  46. +++ b/src/cmd/7g/galign.c
    47. 

  47. @@ -4,8 +4,8 @@
    48. 

  48.  
    49. 

  49.  #include "gg.h"
    50. 

  50.  
    51. 

  51. -int	thechar	= '8';
    52. 

  52. -char*	thestring	= "386";
    53. 

  53. +int	thechar	= '7';
    54. 

  54. +char*	thestring	= "jvm";
    55. 

  55.  
    56. 

  56.  
    57. 

  57.  /*
    58. 

  58. diff --git a/src/cmd/7g/gg.h b/src/cmd/7g/gg.h
    59. 

  59. --- a/src/cmd/7g/gg.h
    60. 

  60. +++ b/src/cmd/7g/gg.h
    61. 

  61. @@ -6,7 +6,7 @@
    62. 

  62.  #include <libc.h>
    63. 

  63.  
    64. 

  64.  #include "../gc/go.h"
    65. 

  65. -#include "../8l/8.out.h"
    66. 

  66. +#include "../7l/7.out.h"
    67. 

  67.  
    68. 

  68.  #ifndef	EXTERN
    69. 

  69.  #define EXTERN	extern
    70. 

  70. diff --git a/src/cmd/7g/gobj.c b/src/cmd/7g/gobj.c
    71. 

  71. --- a/src/cmd/7g/gobj.c
    72. 

  72. +++ b/src/cmd/7g/gobj.c
    73. 

  73. @@ -1,5 +1,5 @@
    74. 

  74. -// Derived from Inferno utils/8c/swt.c
    75. 

  75. -// http://code.google.com/p/inferno-os/source/browse/utils/8c/swt.c
    76. 

  76. +// Derived from Inferno utils/7c/swt.c
    77. 

  77. +// http://code.google.com/p/inferno-os/source/browse/utils/7c/swt.c
    78. 

  78.  //
    79. 

  79.  //	Copyright Š 1994-1999 Lucent Technologies Inc.  All rights reserved.
    80. 

  80.  //	Portions Copyright Š 1995-1997 C H Forsyth (forsyth@terzarima.net)
    81.