diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-22 18:02:55 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-22 18:02:56 -0700 |
| commit | 5c3bee7defca81362e98cf8fbd6c20cf47dff00b (patch) | |
| tree | d2fd5588c5014f1f7e976189f5d83522bce42609 | |
| parent | d413626b7ee75da998d8366af576b75071fb5d74 (diff) | |
| parent | 3a7fb48bf845afe4d543a2c6bb107ee2a9b46b94 (diff) | |
| download | grub-jb-mr1-dev-plus-aosp.tar.gz | |
Merge "gcc 4.6: don't reorder functions"android-sdk-support_r11android-sdk-adt_r20android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-cts-4.2_r2android-cts-4.2_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2_pre3android-4.2_pre2.2android-4.2_pre2.1android-4.2_pre2android-4.2_pre1.1android-4.2_pre1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22tools_r21tools_r20kitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-factory-releasejb-mr1-dev-plus-aospjb-mr1-devics-plus-aosp
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -30,7 +30,7 @@ LOCAL_CFLAGS := \ -Wall -Wmissing-prototypes -Wunused -Wshadow \ -Wpointer-arith -falign-jumps=1 -falign-loops=1 \ -falign-functions=1 -Wundef -LOCAL_CFLAGS += -m32 -O2 -fno-builtin -nostdinc +LOCAL_CFLAGS += -m32 -O2 -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector LOCAL_C_INCLUDES := $(LOCAL_PATH)/stage1 @@ -87,7 +87,7 @@ LOCAL_CFLAGS := \ -Wpointer-arith -falign-jumps=1 -falign-loops=1 \ -falign-functions=1 -Wundef -LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc +LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFSYS_EXT2FS=1 -DSUPPORT_SERIAL=1 @@ -124,7 +124,7 @@ LOCAL_CFLAGS := \ -Wpointer-arith -falign-jumps=1 -falign-loops=1 \ -falign-functions=1 -Wundef -LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc +LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFSYS_EXT2FS=1 -DSUPPORT_SERIAL=1 |