Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d753dda authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 439f279d: am 62911d47: am 1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."

* commit '439f279d':
  Leave 'linux' defined on mips/mips64, like arm.
parents 131e93af 439f279d
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ android_config_h := $(call select-android-config-h,linux-mips)


$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
			$(TARGET_mips_CFLAGS) \
			$(TARGET_mips_CFLAGS) \
			-Ulinux -U__unix -U__unix__ -Umips \
			-U__unix -U__unix__ -Umips \
			-fpic -fPIE\
			-fpic -fPIE\
			-ffunction-sections \
			-ffunction-sections \
			-fdata-sections \
			-fdata-sections \
+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ android_config_h := $(call select-android-config-h,linux-mips64)


TARGET_GLOBAL_CFLAGS += \
TARGET_GLOBAL_CFLAGS += \
			$(TARGET_mips_CFLAGS) \
			$(TARGET_mips_CFLAGS) \
			-Ulinux -U__unix -U__unix__ -Umips \
			-U__unix -U__unix__ -Umips \
			-fpic -fPIE\
			-fpic -fPIE\
			-ffunction-sections \
			-ffunction-sections \
			-fdata-sections \
			-fdata-sections \