diff options
Diffstat (limited to 'prepare.patch')
| -rw-r--r-- | prepare.patch | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/prepare.patch b/prepare.patch index 20e9fd9f1f9a..f3db0237c117 100644 --- a/prepare.patch +++ b/prepare.patch @@ -3,12 +3,18 @@ @@ -10 +10 @@
-MY_ASM = asmc
+MY_ASM = uasm
-@@ -29 +29 @@
-- -fPIC
-+ -fPIC -Wno-maybe-uninitialized
-@@ -170 +170 @@
--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) -Wl,-z,noexecstack $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
+@@ -78 +78 @@
+-LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC)
++LDFLAGS += -shared -fPIC $(LDFLAGS_STATIC)
+@@ -85 +85 @@
+-LDFLAGS = $(LDFLAGS_STATIC)
++LDFLAGS += $(LDFLAGS_STATIC)
+@@ -141 +141 @@
+-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@
++CFLAGS += $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@
+@@ -182 +182 @@
+-CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)
++CXXFLAGS += $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)
--- CPP/7zip/var_gcc_x64.mak
+++ CPP/7zip/var_gcc_x64.mak
|