diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-18 14:59:39 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-18 14:59:39 +0100 |
| commit | b0851e5949b4d241106f130bc9febb9a5ff0acb6 (patch) | |
| tree | 16b884cbf4428d440848eaae01c6117edb783a5b | |
| parent | 720f55cc4bb15818b8df845e11647bbafa9709c7 (diff) | |
| parent | c3cabf4e336c104542bb248730094747b13977b1 (diff) | |
| download | micropython-b0851e5949b4d241106f130bc9febb9a5ff0acb6.tar.gz micropython-b0851e5949b4d241106f130bc9febb9a5ff0acb6.zip | |
Merge pull request #700 from swegener/for-upstream
bare-arm, stmhal: Disable stack protector
| -rw-r--r-- | bare-arm/Makefile | 4 | ||||
| -rw-r--r-- | stmhal/Makefile | 4 | ||||
| -rw-r--r-- | teensy/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bare-arm/Makefile b/bare-arm/Makefile index 745945deb6..ed8c00482b 100644 --- a/bare-arm/Makefile +++ b/bare-arm/Makefile @@ -13,7 +13,7 @@ INC += -I$(PY_SRC) INC += -I$(BUILD) CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion -CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 $(CFLAGS_CORTEX_M4) $(COPT) +CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT) #Debugging/Optimization ifeq ($(DEBUG), 1) @@ -22,7 +22,7 @@ else CFLAGS += -Os -DNDEBUG endif -LDFLAGS = --nostdlib -T stm32f405.ld +LDFLAGS = -nostdlib -T stm32f405.ld LIBS = SRC_C = \ diff --git a/stmhal/Makefile b/stmhal/Makefile index e27dd7b6ce..3cc98d7be8 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -41,7 +41,7 @@ INC += -I$(FATFS_DIR)/src INC += -I$(CC3K_DIR) CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion -CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 $(CFLAGS_CORTEX_M4) $(COPT) +CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT) CFLAGS += -Iboards/$(BOARD) @@ -53,7 +53,7 @@ else COPT += -Os -DNDEBUG endif -LDFLAGS = --nostdlib -T stm32f405.ld -Map=$(@:.elf=.map) --cref +LDFLAGS = -nostdlib -T stm32f405.ld -Map=$(@:.elf=.map) --cref LIBS = # uncomment this if you want libgcc diff --git a/teensy/Makefile b/teensy/Makefile index 00f3514724..8244d52d31 100644 --- a/teensy/Makefile +++ b/teensy/Makefile @@ -23,7 +23,7 @@ INC += -I$(PY_SRC) INC += -I$(BUILD) INC += -I$(CORE_PATH) -CFLAGS = $(INC) -Wall -ansi -std=gnu99 $(CFLAGS_CORTEX_M4) +CFLAGS = $(INC) -Wall -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) LDFLAGS = -nostdlib -T mk20dx256.ld LIBS = -L $(COMPILER_PATH)/../lib/gcc/arm-none-eabi/4.7.2/thumb2 -lgcc |