> I have a slightly different issue, last week it was still okay, > but now I get (using gcc-4.8 as bootstrap compiler): > > gcc -std=gnu99 -c -g -gnatpg -gnatwns -gnata -W -Wall -nostdinc -I- -I. > -Iada/generated -Iada -Iada/gcc-interface -I../../gcc-trunk/gcc/ada > -I../../gcc-trunk/gcc/ada/gcc-interface -Iada/libgnat > -I../../gcc-trunk/gcc/ada/libgnat ../../gcc-trunk/gcc/ada/atree.adb -o > ada/atree.o atree.adb:569:30: "Shift_Right" is not visible (more references > follow) atree.adb:569:30: non-visible declaration at interfac.ads:147 > atree.adb:569:30: non-visible declaration at interfac.ads:127 > atree.adb:569:30: non-visible declaration at interfac.ads:107 > atree.adb:569:30: non-visible declaration at interfac.ads:87 > atree.adb:569:30: non-visible declaration at s-unstyp.ads:220 > atree.adb:569:30: non-visible declaration at s-unstyp.ads:200 > atree.adb:569:30: non-visible declaration at s-unstyp.ads:180 > atree.adb:569:30: non-visible declaration at s-unstyp.ads:160 > atree.adb:569:30: non-visible declaration at s-unstyp.ads:140 > atree.adb:569:30: non-visible declaration at s-unstyp.ads:120 > atree.adb:631:26: "Shift_Left" is not visible (more references follow) > atree.adb:631:26: non-visible declaration at interfac.ads:143 > atree.adb:631:26: non-visible declaration at interfac.ads:123 > atree.adb:631:26: non-visible declaration at interfac.ads:103 > atree.adb:631:26: non-visible declaration at interfac.ads:83 > atree.adb:631:26: non-visible declaration at s-unstyp.ads:216 > atree.adb:631:26: non-visible declaration at s-unstyp.ads:196 > atree.adb:631:26: non-visible declaration at s-unstyp.ads:176 > atree.adb:631:26: non-visible declaration at s-unstyp.ads:156 > atree.adb:631:26: non-visible declaration at s-unstyp.ads:136 > atree.adb:631:26: non-visible declaration at s-unstyp.ads:116 > make[3]: *** [ada/atree.o] Error 1 > make[3]: *** Waiting for unfinished jobs....
Yes, the merge is incomplete, temporarily replace pragma Provide_Shift_Operators (Slot); in atree.ads with function Shift_Left (S : Slot; V : Natural) return Slot; pragma Import (Intrinsic, Shift_Left); function Shift_Right (S : Slot; V : Natural) return Slot; pragma Import (Intrinsic, Shift_Right); -- Eric Botcazou