Skip to content

Commit

Permalink
Added more restrictions to the Xpresso system.ads and changed the def…
Browse files Browse the repository at this point in the history
…ault word size to 32 bit.

Added interfac.ads to the RTS build.
  • Loading branch information
Lucretia committed Apr 8, 2011
1 parent ec71666 commit 541428c
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 23 deletions.
49 changes: 28 additions & 21 deletions rts/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,42 @@ TARGET =
else
ifeq ($(BOARD),beagle)
TARGET = arm-none-eabi-
ADAFLAGS = -mcpu=cortex-a8
TARGETFLAGS = -mcpu=cortex-a8
else
ifeq ($(BOARD),xpresso1769)
TARGET = arm-none-eabi-
ADAFLAGS = -mcpu=cortex-m3 -mthumb
TARGETFLAGS = -mcpu=cortex-m3 -mthumb
endif
endif
endif

FLAGS = -c -gnat2005 $(ADAFLAGS) $(DEBUG) -gnatg \
-ffunction-sections -fdata-sections \
-nostdinc -nostdlib --RTS=./boards/$(BOARD)
# Add flags to force the compiler to conform to the standard, see
# S.12.6 of the GNAT Reference Manual.
CONFORMANCE = -gnato -gnatE -fstack-check

FLAGS = -c -gnat2005 $(TARGETFLAGS) $(DEBUG) -gnatg \
$(CONFORMANCE) \
-gnatyy \
-ffunction-sections -fdata-sections \
-nostdinc -nostdlib --RTS=./boards/$(BOARD)

# -I./src/boards/$(BOARD)

LIBNAME = libgnat.a

OBJS = obj/ada.o \
obj/a-unccon.o \
obj/a-uncdea.o \
obj/gnat.o \
obj/g-souinf.o \
obj/s-stoele.o \
obj/s-atacco.o \
obj/s-maccod.o \
obj/system.o \
obj/last_chance_handler.o
# obj/interfac.o \
LIBNAME = libgnat.a

OBJS = obj/ada.o \
obj/a-unccon.o \
obj/a-uncdea.o \
obj/gnat.o \
obj/g-souinf.o \
obj/interfac.o \
obj/s-stoele.o \
obj/s-atacco.o \
obj/s-maccod.o \
obj/system.o \
obj/last_chance_handler.o
# obj/i-c.o
ALIS = $(OBJS:.o=.ali)
ALIS = $(OBJS:.o=.ali)

all: $(LIBNAME)

Expand All @@ -60,8 +67,8 @@ obj/gnat.o obj/gnat.ali: src/common/gnat.ads
obj/g-souinf.o obj/g-souinf.ali: src/common/g-souinf.ads
$(TARGET)gcc $(FLAGS) src/common/g-souinf.ads -o obj/g-souinf.o

# obj/interfac.o obj/interfac.ali: src/common/interfac.ads
# $(TARGET)gcc $(FLAGS) src/common/interfac.ads -o obj/interfac.o
obj/interfac.o obj/interfac.ali: src/common/interfac.ads
$(TARGET)gcc $(FLAGS) src/common/interfac.ads -o obj/interfac.o

# obj/i-c.o obj/i-c.ali: src/common/i-c.ads src/common/i-c.adb
# $(TARGET)gcc $(FLAGS) src/common/i-c.adb -o obj/i-c.o
Expand Down
4 changes: 2 additions & 2 deletions thirdparty/build-rts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ function create_dirs()
done
}

# i-c.ads i-c.adb interfac.ads
SPECS="ada.ads a-unccon.ads a-uncdea.ads s-stoele.ads s-atacco.ads s-maccod.ads gnat.ads g-souinf.ads"
# i-c.ads i-c.adb
SPECS="ada.ads a-unccon.ads a-uncdea.ads gnat.ads g-souinf.ads interfac.ads s-stoele.ads s-atacco.ads s-maccod.ads"
BODIES="s-stoele.adb s-atacco.adb"

# function copy_rts_files()
Expand Down

0 comments on commit 541428c

Please sign in to comment.