diff options
| author | Lukas Larsson <[email protected]> | 2014-03-17 15:49:50 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-26 15:18:57 +0100 |
| commit | f6570cf6201bf6476d903def9b04fe9c33f13a3d (patch) | |
| tree | f84d2c6df1a06d962ee4d5391126379457f7245f /erts/emulator | |
| parent | ebad8e4c3a26e5ed3813ede2ca539123a1d31812 (diff) | |
| download | otp-f6570cf6201bf6476d903def9b04fe9c33f13a3d.tar.gz otp-f6570cf6201bf6476d903def9b04fe9c33f13a3d.tar.bz2 otp-f6570cf6201bf6476d903def9b04fe9c33f13a3d.zip | |
ose: Break lmconf into one per load module
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/Makefile.in | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/ose/beam.lmconf (renamed from erts/emulator/sys/ose/default.lmconf) | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 523130d01a..c6c9b4cf8c 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -1031,7 +1031,7 @@ else ifeq ($(findstring ose,$(TARGET)),ose) $(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS) $(LCF) $(call build-ose-load-module, $@, $(INIT_OBJS) $(OBJS), $(STATIC_NIF_LIBS) \ - $(STATIC_DRIVER_LIBS) $(LIBS), $(LMCONF)) + $(STATIC_DRIVER_LIBS) $(LIBS), $(BEAM_LMCONF)) else $(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS) diff --git a/erts/emulator/sys/ose/default.lmconf b/erts/emulator/sys/ose/beam.lmconf index a66b0ece56..2cee836f9a 100644 --- a/erts/emulator/sys/ose/default.lmconf +++ b/erts/emulator/sys/ose/beam.lmconf @@ -4,6 +4,7 @@ OSE_LM_POOL_SIZE=0x200000 OSE_LM_MAIN_NAME=main OSE_LM_MAIN_STACK_SIZE=0xF000 OSE_LM_MAIN_PRIORITY=20 +## Has to be of a type that allows MAM OSE_LM_PROGRAM_TYPE=APP_RAM OSE_LM_DATA_INIT=YES OSE_LM_BSS_INIT=YES |